summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-09 13:37:56 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-09 13:37:56 -0400
commit09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 (patch)
tree09125cf5f4fb3e20709d6c39f78e419791db67d7 /src/or/config.c
parent0b3166fffa0e5e19c63fd95538f87d634444d28c (diff)
parentcd42ae71850985ed8dd34ae73dc6265a643fcb13 (diff)
downloadtor-09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57.tar.gz
tor-09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57.zip
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 666a1bdc34..34208e85bf 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -255,6 +255,7 @@ static config_var_t _option_vars[] = {
V(FetchServerDescriptors, BOOL, "1"),
V(FetchHidServDescriptors, BOOL, "1"),
V(FetchUselessDescriptors, BOOL, "0"),
+ V(FetchV2Networkstatus, BOOL, "0"),
#ifdef WIN32
V(GeoIPFile, FILENAME, "<default>"),
#else