sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-09-04 11:40:01 -04:00
parent faa28d40ec a7aeb6f58f
commit 3a5cf9aa2f
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug23275 Normal file
View File

@ -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.

2
src/or/main.c
View File

@ -1487,7 +1487,7 @@ run_scheduled_events(time_t now)
/* 12. launch diff computations. (This is free if there are none to /* 12. launch diff computations. (This is free if there are none to
* launch.) */ * launch.) */
if (server_mode(options)) { if (dir_server_mode(options)) {
consdiffmgr_rescan(); consdiffmgr_rescan();
} }
} }

2
src/or/networkstatus.c
View File

@ -2014,7 +2014,7 @@ networkstatus_set_current_consensus(const char *consensus,
&c->digests, &c->digests,
c->digest_sha3_as_signed, c->digest_sha3_as_signed,
c->valid_after); c->valid_after);
if (server_mode(get_options())) { if (dir_server_mode(get_options())) {
consdiffmgr_add_consensus(consensus, c); consdiffmgr_add_consensus(consensus, c);
} }
} }