From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 3 Jun 2011 14:47:35 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~83
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13ec1bf5c2d5195789eaa0a002d021c9693a3b71;p=thirdparty%2Ftor.git

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

13ec1bf5c2d5195789eaa0a002d021c9693a3b71
diff --cc src/or/config.c
index 988998ed56,44cecf353b..124dcb97d9
--- 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"),