From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 4 Oct 2012 14:05:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.4-alpha~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d9847165e0f8b6528acdf3e7246c454c3c4b1597;p=thirdparty%2Ftor.git

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

d9847165e0f8b6528acdf3e7246c454c3c4b1597
diff --cc src/or/circuitbuild.c
index be97b7c1cf,a7d370c0ea..230dd8105e
--- 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),