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

Conflicts:
	changes/bug10485
	src/or/rephist.c
	src/or/status.c

diff --cc changes/bug10485
index aa599fba7261d3d8ecf72a7aed20fa8c656daea7,7e5fa530e880c0b0492e10e1da828174be39f81b..d2b3d8be0b0ec61fb1039ec19d8faf004448f199
--- 1/changes/bug10485
--- 2/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 dd4ef12efef1540e12e9f9e7e77e20554443555a,2948bf8f001d47e7e6c5573113796a7cf51b0ea5..66dc5f611f858a44f23ea9b5c5d214f82c662823
--- 1/src/or/rephist.c
--- 2/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 415f4daea89cd754b11cfca17d618924e94a3494,69f92ed0974aaf63e1db2803521ce8c68033c851..e1820c888996bfdbc20e2e496f7b43ec4e58b875
--- 1/src/or/status.c
--- 2/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