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

Conflicts:
	src/or/directory.c

6 files changed, 18 insertions, 2 deletions

diff --git a/changes/bug3022 b/changes/bug3022
new file mode 100644
index 0000000000..9472e6d196
--- /dev/null
+++ b/changes/bug3022
@@ -0,0 +1,6 @@
+  o Removed features
+    - Caches no longer download and serve v2 networkstatus documents
+      unless FetchV2Networkstatus flag is set: these documents haven't
+      haven't been used by clients or relays since 0.2.0.x.  Resolves
+      bug 3022.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index fcee7484ab..8fe4fe8bc9 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1212,6 +1212,12 @@ if DirPort is non-zero):
     Set an entrance policy for this server, to limit who can connect to the
     directory ports. The policies have the same form as exit policies above.
 
+**FetchV2Networkstatus** **0**|**1**::
+    If set, we try to fetch the (obsolete, unused) version 2 network status
+    consensus documents from the directory authorities. No currently
+    supported Tor version uses them.  (Default: 0.)
+
+
 DIRECTORY AUTHORITY SERVER OPTIONS
 ----------------------------------
 
diff --git a/src/or/config.c b/src/or/config.c
index 09ad51f00c..5b251d382a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -262,6 +262,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
diff --git a/src/or/directory.c b/src/or/directory.c
index 145de3d750..313c6c5a40 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -363,6 +363,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
       break;
     case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS:
       type = V2_DIRINFO;
+      prefer_authority = 1; /* Only v2 authorities have these anyway. */
       break;
     case DIR_PURPOSE_FETCH_SERVERDESC:
       type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO :
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 663d1ad919..7fd3d365f4 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1365,7 +1365,7 @@ update_networkstatus_downloads(time_t now)
   or_options_t *options = get_options();
   if (should_delay_dir_fetches(options))
     return;
-  if (directory_fetches_dir_info_early(options))
+  if (authdir_mode_any_main(options) || options->FetchV2Networkstatus)
     update_v2_networkstatus_cache_downloads(now);
   update_consensus_networkstatus_downloads(now);
   update_certificate_downloads(now);
diff --git a/src/or/or.h b/src/or/or.h
index 36ab508ca6..f58876e496 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2655,7 +2655,9 @@ typedef struct {
   /** Boolean: do we publish hidden service descriptors to the HS auths? */
   int PublishHidServDescriptors;
   int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */
-  int FetchHidServDescriptors; /** and hidden service descriptors? */
+  int FetchHidServDescriptors; /**< and hidden service descriptors? */
+  int FetchV2Networkstatus; /**< Do we fetch v2 networkstatus documents when
+                             * we don't need to? */
   int HidServDirectoryV2; /**< Do we participate in the HS DHT? */
 
   int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden