Merge branch 'bug6852'

Conflicts: src/or/status.c
2024-12-06 19:41:15 +01:00 · 2015-02-03 13:06:58 -05:00
parent d03e1da232 7f52dc4d03
commit cdc49629c7
4 changed files with 46 additions and 1 deletions
@@ -0,0 +1,3 @@
+  o Minor features:
+    - Add a unique client counter to the heartbeat message. Resolves
+      ticket 6852.