Merge remote-tracking branch 'public/feature9777_024_squashed'

Conflicts:
	src/or/circuitbuild.c

diff --cc src/or/circuitbuild.c
index 8e6bb59ef3277240b82569db2ff69025c917d096,e47a2780af1fbae136bc59904132feba1485d445..ffcca4666cf77c6fd84eb3c8b8acd7e667b3d526
--- 1/src/or/circuitbuild.c
--- 2/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

diff --cc src/or/circuitlist.c
Simple merge

diff --cc src/or/circuitlist.h
Simple merge