aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-07-18 17:57:06 -0400
committerNick Mathewson <nickm@torproject.org>2011-07-18 17:57:06 -0400
commit2163e420b2aea36b57a620eb4bb2ff1e7c9e966f (patch)
treee3d82ed21c04d63a274aafd1bf6c9b132a9aceff /src/or/config.c
parent99348ce8314d8e69e9b595fc345583ea713bf722 (diff)
parentb49e561f01bc84ee215895261390eb435ad31c8d (diff)
downloadtor-2163e420b2aea36b57a620eb4bb2ff1e7c9e966f.tar
tor-2163e420b2aea36b57a620eb4bb2ff1e7c9e966f.tar.gz
Merge remote-tracking branch 'public/bug3560'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index cdf0122f7..c6dd4673a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -390,7 +390,7 @@ static config_var_t _option_vars[] = {
V(UpdateBridgesFromAuthority, BOOL, "0"),
V(UseBridges, BOOL, "0"),
V(UseEntryGuards, BOOL, "1"),
- V(UseMicrodescriptors, AUTOBOOL, "0"),
+ V(UseMicrodescriptors, AUTOBOOL, "auto"),
V(User, STRING, NULL),
VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"),
VAR("V2AuthoritativeDirectory",BOOL, V2AuthoritativeDir, "0"),