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

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/config.c
index 988998ed56c625bdaa86e84c0151649bc8a8f932,44cecf353be4c3499c9753d54ff166e4489abcf5..124dcb97d92af167675f915cd68c2981e5f10c5a
--- 1/src/or/config.c
--- 2/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"),

diff --cc src/or/or.h
Simple merge