commit cf744acae9feed93f41106dee7e0a6e44820139b Author: Roger Dingledine arma@torproject.org Date: Thu Sep 5 01:48:18 2013 -0400

fold in another changes item --- ChangeLog | 3 +++ changes/ticket9658 | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 427ded3..f237e27 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 a8db2ef..0000000 --- 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.