diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-19 16:04:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 16:04:56 -0400 |
| commit | 33841a60303ce8febf8180829a868dcc43924d77 (patch) | |
| tree | b6659106946214140b2d7f2582f5ee869d5c140e /src/or | |
| parent | 0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3 (diff) | |
| parent | 2d21f03cdcf759e434b5f82abe9bd285c37004ff (diff) | |
| download | tor-33841a60303ce8febf8180829a868dcc43924d77.tar.gz tor-33841a60303ce8febf8180829a868dcc43924d77.zip | |
Merge remote-tracking branch 'teor/fix18809-warnings' into maint-0.2.8
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/networkstatus.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 01f571e6c9..51fc01108f 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1236,7 +1236,11 @@ networkstatus_get_reasonably_live_consensus(time_t now, int flavor) /** Check if we need to download a consensus during tor's bootstrap phase. * If we have no consensus, or our consensus is unusably old, return 1. * As soon as we have received a consensus, return 0, even if we don't have - * enough certificates to validate it. */ + * enough certificates to validate it. + * If a fallback directory gives us a consensus we can never get certs for, + * check_consensus_waiting_for_certs() will wait 20 minutes before failing + * the cert downloads. After that, a new consensus will be fetched from a + * randomly chosen fallback. */ MOCK_IMPL(int, networkstatus_consensus_is_bootstrapping,(time_t now)) { |