commit 43caa0a8eca0942b25c665163a1b34d13f2ead14 Author: Roger Dingledine arma@torproject.org Date: Thu Jul 7 13:41:38 2011 -0400

fold in new changes entries --- ChangeLog | 8 +++++++- changes/bug3536 | 5 ----- changes/geoip-july2011 | 3 --- 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog index c77177b..4bf9452 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ -Changes in version 0.2.2.30-rc - 2011-07-06 +Changes in version 0.2.2.30-rc - 2011-07-07 o Minor bugfixes: + - Send a SUCCEEDED stream event to the controller when a reverse + resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue + discovered by katmagic. - Always NUL-terminate the sun_path field of a sockaddr_un before passing it to the kernel. (Not a security issue: kernels are smart enough to reject bad sockaddr_uns.) Found by Coverity; @@ -15,6 +18,9 @@ Changes in version 0.2.2.30-rc - 2011-07-06 service we didn't ask for. Found by Coverity; CID #30. Bugfix on 0.2.2.26-beta.

+ o Minor features: + - Update to the July 1 2011 Maxmind GeoLite Country database. +

Changes in version 0.2.2.29-beta - 2011-06-20 Tor 0.2.2.29-beta reverts an accidental behavior change for users who diff --git a/changes/bug3536 b/changes/bug3536 deleted file mode 100644 index d3cec13..0000000 --- a/changes/bug3536 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Send a SUCCEEDED stream event to the controller when a reverse - resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue - discovered by katmagic. - diff --git a/changes/geoip-july2011 b/changes/geoip-july2011 deleted file mode 100644 index 7a9f119..0000000 --- a/changes/geoip-july2011 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the July 1 2011 Maxmind GeoLite Country database. -