summaryrefslogtreecommitdiff
path: root/src/or/entrynodes.h
diff options
context:
space:
mode:
authorteor <teor2345@gmail.com>2017-11-22 01:50:46 +1100
committerteor <teor2345@gmail.com>2017-11-22 02:00:34 +1100
commit690f646bf8a5de9b099fb5295ba9ff252e5606f4 (patch)
treee45732bbcfbcde8fc5b3aa384f13ffc7a2d65cd3 /src/or/entrynodes.h
parentda82e0b5795c449f4442c87e065e9a60da4892a8 (diff)
downloadtor-690f646bf8a5de9b099fb5295ba9ff252e5606f4.tar.gz
tor-690f646bf8a5de9b099fb5295ba9ff252e5606f4.zip
Stop checking cached bridge descriptors for usable bridges
Stop checking for bridge descriptors when we actually want to know if any bridges are usable. This avoids potential bootstrapping issues. Fixes bug 24367; bugfix on 0.2.0.3-alpha. Stop stalling when bridges are changed at runtime. Stop stalling when old bridge descriptors are cached, but they are not in use. Fixes bug 24367; bugfix on 23347 in 0.3.2.1-alpha.
Diffstat (limited to 'src/or/entrynodes.h')
-rw-r--r--src/or/entrynodes.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h
index d177f6cff4..ad6b47936f 100644
--- a/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@ -383,8 +383,7 @@ void entry_guards_note_internet_connectivity(guard_selection_t *gs);
int update_guard_selection_choice(const or_options_t *options);
-/* Used by bridges.c only. */
-int num_bridges_usable(void);
+MOCK_DECL(int,num_bridges_usable,(void));
#ifdef ENTRYNODES_PRIVATE
/**