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

[nickm at torproject.org]

commit 1b93e3c6d9802d64db7ce752717cf02ed35d1b60
Merge: 34740a1 655adbf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 6 13:27:04 2014 -0500

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    Conflicts:
    	changes/bug10485
    	src/or/rephist.c
    	src/or/status.c

 changes/bug10485 |    8 ++++++++
 src/or/rephist.c |    1 -
 src/or/status.c  |    3 +--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --cc changes/bug10485
index aa599fb,7e5fa53..d2b3d8b
--- a/changes/bug10485
+++ b/changes/bug10485
@@@ -1,4 -1,4 +1,12 @@@
++<<<<<<< HEAD
 +  o Minor bugfixes:
 +    - Turn "circuit handshake stats since last time" log messages into a
 +      heartbeat message. Fixes bug 10485; bugfix on 0.2.4.17-rc.
 +
++||||||| merged common ancestors
++=======
+   o Minor bugfixes:
+     - Move message about circuit handshake counts into the heartbeat
+       message where it belongs, instead of logging it once per hour
+       unconditionally. Fixes bug 10485; bugfix on 0.2.4.17-rc.
++>>>>>>> origin/maint-0.2.4
diff --cc src/or/rephist.c
index dd4ef12,2948bf8..66dc5f6
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@@ -3017,8 -3041,7 +3017,7 @@@ voi
  rep_hist_log_circuit_handshake_stats(time_t now)
  {
    (void)now;
-   /* XXX024 maybe quiet this log message before 0.2.4 goes stable for real */
 -  log_notice(LD_HIST, "Circuit handshake stats since last time: "
 +  log_notice(LD_HEARTBEAT, "Circuit handshake stats since last time: "
               "%d/%d TAP, %d/%d NTor.",
               onion_handshakes_completed[ONION_HANDSHAKE_TYPE_TAP],
               onion_handshakes_requested[ONION_HANDSHAKE_TYPE_TAP],
diff --cc src/or/status.c
index 415f4da,69f92ed..e1820c8
--- a/src/or/status.c
+++ b/src/or/status.c
@@@ -14,11 -14,8 +14,12 @@@
  #include "router.h"
  #include "circuitlist.h"
  #include "main.h"
 +#include "rephist.h"
  #include "hibernate.h"
+ #include "rephist.h"
 +#include "statefile.h"
 +
 +static void log_accounting(const time_t now, const or_options_t *options);
  
  /** Return the total number of circuits. */
  static int