diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-21 12:44:21 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-21 12:44:21 -0500 |
| commit | c35d481f56284ebeafc2860eed27c9833d631983 (patch) | |
| tree | 128a9e3e4bbcb86560a93a3ddb8205e76973b7dd /src/or/router.h | |
| parent | 6dc25e79b98ed5cb9f29de174878333a1175f755 (diff) | |
| parent | e2c881487cab57b1b4301560f10b4e3ff4a44167 (diff) | |
| download | tor-c35d481f56284ebeafc2860eed27c9833d631983.tar.gz tor-c35d481f56284ebeafc2860eed27c9833d631983.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'src/or/router.h')
| -rw-r--r-- | src/or/router.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/router.h b/src/or/router.h index 73bfea1faa..c30a0301b7 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -91,7 +91,8 @@ const uint8_t *router_get_my_id_digest(void); int router_extrainfo_digest_is_me(const char *digest); int router_is_me(const routerinfo_t *router); MOCK_DECL(int,router_pick_published_address,(const or_options_t *options, - uint32_t *addr)); + uint32_t *addr, + int cache_only)); int router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e); int router_rebuild_descriptor(int force); char *router_dump_router_to_string(routerinfo_t *router, |