Merge remote-tracking branch 'public/bug3560'

This commit is contained in:
Nick Mathewson 2011-07-18 17:57:06 -04:00
commit 2163e420b2
2 changed files with 6 additions and 1 deletions

5
changes/microdescs_on Normal file
View File

@ -0,0 +1,5 @@
o Major features:
- The microdescriptor system is now on by default for clients. This
allows clients to use Tor while downloading a much smaller amount
of directory information. To disable it, set "UseMicrodescriptors 0"
in your torrc file.

View File

@ -390,7 +390,7 @@ static config_var_t _option_vars[] = {
V(UpdateBridgesFromAuthority, BOOL, "0"), V(UpdateBridgesFromAuthority, BOOL, "0"),
V(UseBridges, BOOL, "0"), V(UseBridges, BOOL, "0"),
V(UseEntryGuards, BOOL, "1"), V(UseEntryGuards, BOOL, "1"),
V(UseMicrodescriptors, AUTOBOOL, "0"), V(UseMicrodescriptors, AUTOBOOL, "auto"),
V(User, STRING, NULL), V(User, STRING, NULL),
VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"),
VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"),