diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 14:40:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 14:40:35 -0400 |
| commit | 639766dbc39c37d9864b99bd024faa5967b22c80 (patch) | |
| tree | 12c560f0f1611a0fc20884198eb3e5efe6f167e6 /src/or/rephist.c | |
| parent | a01e4a1a957bc6a500930bb1221adf3b916d65f9 (diff) | |
| parent | 49b5ad6b75f5f9e223a92033d9b3930e3e1d132f (diff) | |
| download | tor-639766dbc39c37d9864b99bd024faa5967b22c80.tar.gz tor-639766dbc39c37d9864b99bd024faa5967b22c80.zip | |
Merge branch 'maint-0.3.1'
Resolve conflict with 23532 code.
Diffstat (limited to 'src/or/rephist.c')
| -rw-r--r-- | src/or/rephist.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rephist.c b/src/or/rephist.c index ae45c5023a..51e800bc31 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -947,9 +947,9 @@ rep_hist_record_mtbf_data(time_t now, int missing_means_down) base16_encode(dbuf, sizeof(dbuf), digest, DIGEST_LEN); if (missing_means_down && hist->start_of_run && - !router_get_by_id_digest(digest)) { + !connection_or_digest_is_known_relay(digest)) { /* We think this relay is running, but it's not listed in our - * routerlist. Somehow it fell out without telling us it went + * consensus. Somehow it fell out without telling us it went * down. Complain and also correct it. */ log_info(LD_HIST, "Relay '%s' is listed as up in rephist, but it's not in " |