summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-10-22 14:36:30 -0400
committerNick Mathewson <nickm@torproject.org>2012-10-22 14:36:30 -0400
commit848333c6d6d65775cb787755577c4b24ae512389 (patch)
tree3f98370fc515a2b94bab7ba0d06e6ec6949ff8a3 /src/or/circuitbuild.c
parentfa6a65756fff4f2c1da82839199baecdb410b5c7 (diff)
downloadtor-848333c6d6d65775cb787755577c4b24ae512389.tar.gz
tor-848333c6d6d65775cb787755577c4b24ae512389.zip
Fix more madness from the split_circuitbuild merge
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 5e85b3e4b3..1fb93bbd2c 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -993,7 +993,8 @@ pathbias_get_notice_rate(const or_options_t *options)
DFLT_PATH_BIAS_NOTICE_PCT, 0, 100)/100.0;
}
-static double
+/* XXXX024 I'd like to have this be static again, but entrynodes.c needs it. */
+double
pathbias_get_disable_rate(const or_options_t *options)
{
// XXX: This needs tuning based on use + experimentation before we set it
@@ -2152,7 +2153,8 @@ choose_good_middle_server(uint8_t purpose,
* If <b>state</b> is NULL, we're choosing a router to serve as an entry
* guard, not for any particular circuit.
*/
-static const node_t *
+/* XXXX024 I'd like to have this be static again, but entrynodes.c needs it. */
+const node_t *
choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state)
{
const node_t *choice;