Merge branch 'maint-0.2.1'

Conflicts:

	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h
This commit is contained in:
Roger Dingledine 2010-03-06 22:46:39 -05:00
commit 407a9d4193

View File

@ -119,23 +119,25 @@ Changes in version 0.2.2.9-alpha - 2010-02-22
open() without checking it.
Changes in version 0.2.1.25 - 2010-??-??
Changes in version 0.2.1.25 - 2010-03-??
o Major bugfixes:
- 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.
- Fix a regression from our patch for bug 1244 that caused relays
to guess their IP address incorrectly if they didn't set Address
in their torrc and/or their address fails to resolve. Bugfix on
0.2.1.23; fixes bug 1269.
- When freeing a session key, zero it out completely. We only zeroed
the first ptrsize bytes. Bugfix on 0.0.2pre8. Discovered and
patched by ekir. Fixes bug 1254.
o Minor bugfixes:
- Fix a dereference-then-NULL-check sequence when publishing
descriptors. Bugfix on tor-0.2.1.5-alpha. Discovered by ekir,
fixes bug 1255.
descriptors. Bugfix on 0.2.1.5-alpha. Discovered by ekir; fixes
bug 1255.
- Fix another dereference-then-NULL-check sequence. Bugfix on
0.2.1.14-rc. Discovered by ekir, fixes bug 1256.
0.2.1.14-rc. Discovered by ekir; fixes bug 1256.
- Make sure we treat potentially not NUL-terminated strings correctly.
Bugfix on 0.1.1.13-alpha. Discovered by rieo, fixes bug 1257.
Bugfix on 0.1.1.13-alpha. Discovered by rieo; fixes bug 1257.
Changes in version 0.2.1.24 - 2010-02-21