commit a046966baf7fcfb2cd51300ed0f69946f4ae1556 Merge: 42d6f34 8e5dfe4 Author: Nick Mathewson nickm@torproject.org Date: Sun Jun 19 21:00:15 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/config.c src/or/or.h
changes/bug2355_revert | 7 +++++++ doc/tor.1.txt | 10 +++------- src/or/config.c | 14 ++++---------- src/or/or.h | 13 +------------ 4 files changed, 15 insertions(+), 29 deletions(-)
diff --cc src/or/config.c index 0ae089e,e0ecab2..ca0d9b0 --- a/src/or/config.c +++ b/src/or/config.c @@@ -387,9 -376,8 +387,9 @@@ static config_var_t _option_vars[] = V(TransPort, PORT, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), - VAR("UseBridges", AUTOBOOL, UseBridges_, "auto"), + 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"),