commit cc5b6d6cee607bbafbfd512986b2eea9c7c2c5ec Merge: 7d015c8 52e36fe Author: Steven Murdoch Steven.Murdoch@cl.cam.ac.uk Date: Thu Aug 18 18:42:02 2011 +0100

Merge remote branch 'origin/master' into bug2046

.gitignore | 2 + ChangeLog | 58 +- Makefile.am | 1 + Makefile.nmake | 5 + changes/bug1692 | 5 + changes/bug2930 | 5 + changes/bug3550 | 5 + changes/bug3615 | 3 + changes/bug3643 | 4 + changes/bug3700 | 6 + changes/bug3732 | 7 + changes/bug3747 | 6 + changes/fmt_addr | 4 + changes/geoip-august2011 | 3 + changes/le-win-threads | 3 + changes/nmake | 3 + changes/optimistic-client | 9 + changes/prop171 | 22 + changes/require-le-2.0.13 | 12 + configure.in | 13 +- doc/tor.1.txt | 114 +- src/common/Makefile.am | 2 +- src/common/Makefile.nmake | 20 + src/common/address.c | 6 +- src/common/compat.h | 2 +- src/common/compat_libevent.c | 5 +- src/common/torgzip.c | 4 - src/common/torint.h | 9 + src/common/tortls.c | 16 + src/common/util.c | 75 +- src/common/util.h | 7 + src/config/geoip | 6191 ++++++++++++++++++----------------- src/or/Makefile.am | 2 +- src/or/Makefile.nmake | 28 + src/or/buffers.c | 110 +- src/or/buffers.h | 19 + src/or/circuitlist.c | 13 +- src/or/circuituse.c | 192 +- src/or/config.c | 506 +++- src/or/config.h | 2 + src/or/connection.c | 600 ++-- src/or/connection.h | 1 + src/or/connection_edge.c | 273 ++- src/or/connection_edge.h | 11 +- src/or/control.c | 39 +- src/or/control.h | 1 + src/or/directory.c | 8 +- src/or/dnsserv.c | 31 +- src/or/geoip.c | 308 ++- src/or/geoip.h | 5 + src/or/main.c | 20 +- src/or/main.h | 1 + src/or/microdesc.c | 6 - src/or/networkstatus.c | 7 - src/or/or.h | 199 ++- src/or/relay.c | 44 +- src/or/rephist.c | 240 +- src/or/rephist.h | 4 + src/or/router.c | 8 +- src/or/routerparse.c | 3 + src/test/test.c | 296 ++- src/tools/tor-fw-helper/Makefile.am | 2 +- src/win32/orconfig.h | 10 + 63 files changed, 5947 insertions(+), 3669 deletions(-)