commit 13ec1bf5c2d5195789eaa0a002d021c9693a3b71 Merge: 587cc31 b79d50d Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 3 10:47:35 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

changes/bug2355 | 8 ++++++++ doc/tor.1.txt | 10 +++++++--- src/or/config.c | 19 +++++++++++++++---- src/or/or.h | 12 +++++++++++- 4 files changed, 41 insertions(+), 8 deletions(-)

diff --cc src/or/config.c index 988998e,44cecf3..124dcb9 --- 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"), - V(UseBridges, BOOL, "0"), + VAR("UseBridges", STRING, UseBridges_, "auto"), V(UseEntryGuards, BOOL, "1"), + V(UseMicrodescriptors, AUTOBOOL, "0"), V(User, STRING, NULL), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"),