diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-11-08 14:21:32 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-05 20:54:12 -0400 |
| commit | 4cc348e896f74a4e02ef15a77d22fc636b08afae (patch) | |
| tree | b83bf38177b446230ee78363155a804bb4ede10f /src/or/config.c | |
| parent | 3df22887a3028318dc34a45984a8a195dfc0c026 (diff) | |
| download | tor-4cc348e896f74a4e02ef15a77d22fc636b08afae.tar.gz tor-4cc348e896f74a4e02ef15a77d22fc636b08afae.zip | |
Code to make clients fetch and use microdescriptors for circuit building
To turn this on, set UseMicrodescriptors to "1" (or "auto" if you
want it on-if-you're-a-client). It should go auto-by-default once
0.2.3.1-alpha is released.
Because of our node logic, directory caches will never use
microdescriptors when they have the right routerinfo available.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index c93699134c..09ad51f00c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -381,6 +381,7 @@ static config_var_t _option_vars[] = { V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), V(UseEntryGuards, BOOL, "1"), + V(UseMicrodescriptors, AUTOBOOL, "0"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"), @@ -919,7 +920,8 @@ consider_adding_dir_authorities(or_options_t *options, if (!options->AlternateBridgeAuthority) type |= BRIDGE_DIRINFO; if (!options->AlternateDirAuthority) - type |= V1_DIRINFO | V2_DIRINFO | V3_DIRINFO; + type |= V1_DIRINFO | V2_DIRINFO | V3_DIRINFO | EXTRAINFO_DIRINFO | + MICRODESC_DIRINFO; if (!options->AlternateHSAuthority) type |= HIDSERV_DIRINFO; add_default_trusted_dir_authorities(type); @@ -4605,7 +4607,7 @@ parse_dir_server_line(const char *line, dirinfo_type_t required_type, log_warn(LD_CONFIG, "Bad v3 identity digest '%s' on DirServer line", flag); } else { - type |= V3_DIRINFO; + type |= V3_DIRINFO|EXTRAINFO_DIRINFO|MICRODESC_DIRINFO; } } else { log_warn(LD_CONFIG, "Unrecognized flag '%s' on DirServer line", |