summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2013-09-05 01:48:18 -0400
committerRoger Dingledine <arma@torproject.org>2013-09-05 01:48:18 -0400
commitcf744acae9feed93f41106dee7e0a6e44820139b (patch)
tree3cbe2aa95a0ca741492ae8c52cfd3cbc7b6973d7
parent60f13485ebd70443a16ab083971073dbb6bdadcf (diff)
downloadtor-cf744acae9feed93f41106dee7e0a6e44820139b.tar.gz
tor-cf744acae9feed93f41106dee7e0a6e44820139b.zip
fold in another changes item
-rw-r--r--ChangeLog3
-rw-r--r--changes/ticket96584
2 files changed, 3 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 427ded3bb0..f237e27648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -41,6 +41,9 @@ Changes in version 0.2.4.17-rc - 2013-09-0x
or we just won't work.)
o Minor features:
+ - Track how many "TAP" and "NTor" circuit handshake requests we get,
+ and how many we complete, and log it every hour to help relay
+ operators follow trends in network load. Addresses ticket 9658.
- Update to the August 7 2013 Maxmind GeoLite Country database.
diff --git a/changes/ticket9658 b/changes/ticket9658
deleted file mode 100644
index a8db2efba8..0000000000
--- a/changes/ticket9658
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features:
- - Track how many "TAP" and "NTor" circuit handshake requests we get,
- and how many we complete, and log it every hour to help relay
- operators follow trends in network load. Addresses ticket 9658.