diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-04 11:40:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-04 11:40:02 -0400 |
| commit | e2e13e7c8a2a40074805a19651d7837484d3a8b8 (patch) | |
| tree | 56e06fa3bca1a4367a9212a719852b43acfaa836 /src/or | |
| parent | 209bfe715cc8c1c59b2578c406749a0d4a5bd8cb (diff) | |
| parent | a7aeb6f58f24e30c329874204a5f0db4b65bb2f0 (diff) | |
| download | tor-e2e13e7c8a2a40074805a19651d7837484d3a8b8.tar.gz tor-e2e13e7c8a2a40074805a19651d7837484d3a8b8.zip | |
Merge branch 'maint-0.3.1'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/main.c | 2 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c index 5d51d1dead..a29fc315a2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1483,7 +1483,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 69bff55cff..7136ab2968 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2021,7 +2021,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); } } |