commit babbd3ff08496bfd3d99f05257279ff6135fb027 Merge: 372adfa 1068e50 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 7 10:47:34 2014 -0500

Merge remote-tracking branch 'public/feature9777_024_squashed'

Conflicts: src/or/circuitbuild.c

changes/feature9777 | 3 ++ src/or/circuitbuild.c | 77 +++++++++++++++++++++++++++++++++++++++++++------ src/or/circuitlist.c | 10 ++++++- src/or/circuitlist.h | 1 + 4 files changed, 81 insertions(+), 10 deletions(-)

diff --cc src/or/circuitbuild.c index 8e6bb59,e47a278..ffcca46 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@@ -57,6 -64,17 +57,9 @@@ static crypt_path_t *onion_next_hop_in_ static int onion_extend_cpath(origin_circuit_t *circ); static int count_acceptable_nodes(smartlist_t *routers); static int onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice); -static int entry_guard_inc_circ_attempt_count(entry_guard_t *guard); -static void pathbias_count_build_success(origin_circuit_t *circ); -static void pathbias_count_successful_close(origin_circuit_t *circ); -static void pathbias_count_collapse(origin_circuit_t *circ); -static void pathbias_count_use_failed(origin_circuit_t *circ); -static void pathbias_measure_use_rate(entry_guard_t *guard); -static void pathbias_measure_close_rate(entry_guard_t *guard); -static void pathbias_scale_use_rates(entry_guard_t *guard); + #ifdef CURVE25519_ENABLED + static int circuits_can_use_ntor(void); + #endif

/** This function tries to get a channel to the specified endpoint, * and then calls command_setup_channel() to give it the right