diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-12 10:38:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-12 10:38:35 -0400 |
| commit | 4027bd2e9680cb5922b006847aa4db6170826bf6 (patch) | |
| tree | 7ad4f1a5405730d0cbb379163d801b2e66396966 /src/or/bridges.h | |
| parent | 8eef7fc845d76da287dd0888b6753178118f7193 (diff) | |
| parent | 1b5e34badb06bb1a844a6e70164fc5c894d95d0a (diff) | |
| download | tor-4027bd2e9680cb5922b006847aa4db6170826bf6.tar.gz tor-4027bd2e9680cb5922b006847aa4db6170826bf6.zip | |
Merge branch 'bug23347_squashed'
Diffstat (limited to 'src/or/bridges.h')
| -rw-r--r-- | src/or/bridges.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/bridges.h b/src/or/bridges.h index 3bfc782f9a..19341818f4 100644 --- a/src/or/bridges.h +++ b/src/or/bridges.h @@ -45,7 +45,7 @@ void bridge_add_from_config(struct bridge_line_t *bridge_line); void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(const or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); -int any_bridge_descriptors_known(void); +MOCK_DECL(int, any_bridge_descriptors_known, (void)); const smartlist_t *get_socks_args_by_bridge_addrport(const tor_addr_t *addr, uint16_t port); |