tor

commit a7aeb6f58f24e30c329874204a5f0db4b65bb2f0
parent 6307a759ed5ce48f31a5c36b08f2563cbb226389
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  4 Sep 2017 11:39:28 -0400

Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1

Diffstat:
A
changes/bug23275
 | 
5
+++++
M
src/or/main.c
 | 
2
+-
M
src/or/networkstatus.c
 | 
2
+-

3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug23275 b/changes/bug23275
@@ -0,0 +1,5 @@
+  o Minor bugfixes (relay):
+    - When a relay is not running as a directory cache, it will no longer
+      generate compressed consensuses and consensus diff information.
+      Previously, this was a waste of disk and CPU.  Fixes bug 23275;
+      bugfix on 0.3.1.1-alpha.
diff --git a/src/or/main.c b/src/or/main.c
@@ -1487,7 +1487,7 @@ run_scheduled_events(time_t now)
 
   /* 12. launch diff computations.  (This is free if there are none to
    * launch.) */
-  if (server_mode(options)) {
+  if (dir_server_mode(options)) {
     consdiffmgr_rescan();
   }
 }
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
@@ -2014,7 +2014,7 @@ networkstatus_set_current_consensus(const char *consensus,
                                                &c->digests,
                                                c->digest_sha3_as_signed,
                                                c->valid_after);
-    if (server_mode(get_options())) {
+    if (dir_server_mode(get_options())) {
       consdiffmgr_add_consensus(consensus, c);
     }
   }