diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:36:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-23 09:36:00 -0500 |
| commit | 5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0 (patch) | |
| tree | b863aa88f8810c86e56f711fe1e032585f80e579 /src/or/routerlist.h | |
| parent | bd22ad12bd84019d00bcd92e2e2390cd910908ce (diff) | |
| parent | ac9b0a3110ea4eea63133c6d2e3572b2cfd22bd6 (diff) | |
| download | tor-5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0.tar.gz tor-5d4bb6f61f360ddcbee83476ff2f93a13f3a19c0.zip | |
Merge remote-tracking branch 'public/ticket9969'
Conflicts:
src/or/directory.c
src/or/routerlist.c
src/or/routerlist.h
src/test/include.am
src/test/test.c
Diffstat (limited to 'src/or/routerlist.h')
| -rw-r--r-- | src/or/routerlist.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 0d22543a27..f106ca2316 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -229,6 +229,10 @@ MOCK_DECL(int, router_descriptor_is_older_than, (const routerinfo_t *router, MOCK_DECL(STATIC was_router_added_t, extrainfo_insert, (routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible)); +MOCK_DECL(STATIC void, initiate_descriptor_downloads, + (const routerstatus_t *source, int purpose, smartlist_t *digests, + int lo, int hi, int pds_flags)); + #endif #endif |