[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

[nickm@xxxxxxxxxxxxxx]

commit d9847165e0f8b6528acdf3e7246c454c3c4b1597
Merge: 10b43f4 b1971d8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 4 10:05:55 2012 -0400

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

 changes/bug7022       |    3 +++
 src/or/circuitbuild.c |   27 ++++++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --cc src/or/circuitbuild.c
index be97b7c,a7d370c..230dd81
--- a/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),

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits