commit d487d6f6d897c82f3bf741b73abca8a7a2b49d43 Merge: 2305454 1fc42db Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 31 15:59:28 2012 -0500

Merge branch 'bug4991_v2'

changes/win32macro | 4 ++ configure.in | 23 ++++----- src/common/address.c | 10 ++-- src/common/compat.c | 62 +++++++++++----------- src/common/compat.h | 24 ++++---- src/common/compat_libevent.c | 4 +- src/common/crypto.c | 6 +- src/common/procmon.c | 10 ++-- src/common/tortls.c | 4 +- src/common/util.c | 66 ++++++++++++------------ src/common/util.h | 12 ++-- src/or/buffers.c | 4 +- src/or/config.c | 22 ++++---- src/or/connection.c | 4 +- src/or/control.c | 14 +++--- src/or/dns.c | 4 +- src/or/eventdns.c | 14 +++--- src/or/eventdns.h | 2 +- src/or/eventdns_tor.h | 7 +-- src/or/main.c | 24 ++++---- src/or/ntmain.h | 2 +- src/or/or.h | 4 +- src/or/reasons.c | 2 +- src/or/transports.c | 16 +++--- src/test/test-child.c | 6 +- src/test/test.c | 4 +- src/test/test_microdesc.c | 4 +- src/test/test_util.c | 28 +++++----- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 4 +- src/tools/tor-fw-helper/tor-fw-helper-upnp.c | 2 +- src/tools/tor-fw-helper/tor-fw-helper.c | 4 +- src/tools/tor-resolve.c | 2 +- src/win32/orconfig.h | 3 +- 33 files changed, 198 insertions(+), 203 deletions(-)