aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-03-04 18:44:31 -0500
committerNick Mathewson <nickm@torproject.org>2010-03-04 18:44:31 -0500
commiteb2e56ad3c469eeee38b63902361e86585da8c7c (patch)
tree2d0c0437aea09b133528dc028e720b851726bb9d /ChangeLog
parentb3ec39af8ff595b9490a330a356366b05c4750b9 (diff)
parent3ff092391b065561da339dc05614beb4e586a4d8 (diff)
downloadtor-eb2e56ad3c469eeee38b63902361e86585da8c7c.tar.gz
tor-eb2e56ad3c469eeee38b63902361e86585da8c7c.zip
Merge commit 'origin/maint-0.2.1'
Conflicts: src/or/config.c src/or/test.c
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ab11ddb6d5..6d4e07b349 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -115,6 +115,10 @@ Changes in version 0.2.1.25 - 2010-??-??
- When freeing a cipher, zero it out completely. We only zeroed
the first ptrsize bytes. Bugfix on tor-0.0.2pre8. Discovered
and patched by ekir. Fixes bug 1254.
+ - Avoid a bug that set IPs incorrectly on relays that did't set
+ Address to an IP address, when that address fails to resolve.
+ Fixes bug 1269.
+
o Minor bugfixes:
- Fix a dereference-then-NULL-check sequence when publishing
descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir,