diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-04 11:40:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-04 11:40:01 -0400 |
| commit | 3a5cf9aa2f50eccbdbbb6f7e04753479c7763e1b (patch) | |
| tree | d0ee2f1826866a0d58248de74478cfa85dc8ee3f | |
| parent | faa28d40eca62d72cc7e7d52d0c5fa47c466ffa6 (diff) | |
| parent | a7aeb6f58f24e30c329874204a5f0db4b65bb2f0 (diff) | |
| download | tor-3a5cf9aa2f50eccbdbbb6f7e04753479c7763e1b.tar.gz tor-3a5cf9aa2f50eccbdbbb6f7e04753479c7763e1b.zip | |
Merge branch 'maint-0.3.1' into release-0.3.1
| -rw-r--r-- | changes/bug23275 | 5 | ||||
| -rw-r--r-- | src/or/main.c | 2 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug23275 b/changes/bug23275 new file mode 100644 index 0000000000..d6c3c47743 --- /dev/null +++ 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 index cb24fd18c8..7b1f4975f7 100644 --- 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 index 25d79139b9..997280de52 100644 --- 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); } } |