diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:15:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 12:15:53 -0400 |
| commit | 36909674b45d05854b821b6ac5952126a2cd2ab3 (patch) | |
| tree | 76ea7ebde26ef0a1296d65681c533c5f4ef8d40a /src/or/networkstatus.h | |
| parent | 5e5d4c99c131279931b702aa2a02639e9bdc0062 (diff) | |
| parent | cdb528d841e753b6cc0b8d8b2aeb6bed183a1a8d (diff) | |
| download | tor-36909674b45d05854b821b6ac5952126a2cd2ab3.tar.gz tor-36909674b45d05854b821b6ac5952126a2cd2ab3.zip | |
Merge remote-tracking branch 'teor/bug18963-remember-v2'
Diffstat (limited to 'src/or/networkstatus.h')
| -rw-r--r-- | src/or/networkstatus.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index f2f8af5c6b..86dda020fe 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -85,8 +85,9 @@ int networkstatus_consensus_is_downloading_usable_flavor(void); #define NSSET_REQUIRE_FLAVOR 16 int networkstatus_set_current_consensus(const char *consensus, const char *flavor, - unsigned flags); -void networkstatus_note_certs_arrived(void); + unsigned flags, + const char *source_dir); +void networkstatus_note_certs_arrived(const char *source_dir); void routers_update_all_from_networkstatus(time_t now, int dir_version); void routers_update_status_from_consensus_networkstatus(smartlist_t *routers, int reset_failures); |