Merge remote-tracking branch 'origin/maint-0.2.3'

diff --cc src/or/circuitbuild.c
index be97b7c1cf8dd8f706b1c2464db62fc8fc8887fa,a7d370c0eaaffb0f1540cc54f6e7a72389d41e38..230dd8105e7447e65d5b2acaa6704d6fe201772c
--- 1/src/or/circuitbuild.c
--- 2/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@@ -2664,9 -2653,9 +2664,9 @@@ pathbias_count_first_hop(origin_circuit
          !circ->build_state->onehop_tunnel) {
        if ((rate_msg = rate_limit_log(&first_hop_notice_limit,
                approx_time()))) {
 -        log_info(LD_BUG,
 +        log_notice(LD_BUG,
                 "One-hop circuit has length %d. Path state is %s. "
-                "Circuit is a %s currently %s. %s",
+                "Circuit is a %s currently %s.%s",
                 circ->build_state->desired_path_len,
                 pathbias_state_to_string(circ->path_state),
                 circuit_purpose_to_string(circ->_base.purpose),
@@@ -2782,9 -2768,9 +2787,9 @@@ pathbias_count_success(origin_circuit_
          !circ->build_state->onehop_tunnel) {
        if ((rate_msg = rate_limit_log(&success_notice_limit,
                approx_time()))) {
 -        log_info(LD_BUG,
 +        log_notice(LD_BUG,
                 "One-hop circuit has length %d. Path state is %s. "
-                "Circuit is a %s currently %s. %s",
+                "Circuit is a %s currently %s.%s",
                 circ->build_state->desired_path_len,
                 pathbias_state_to_string(circ->path_state),
                 circuit_purpose_to_string(circ->_base.purpose),