Nick Mathewson 9f88c1e14f Merge remote-tracking branch 'origin/maint-0.2.2' ... Conflicts: src/or/circuitbuild.c		2012-03-09 14:30:12 -05:00
..
bug4361	Add comments and changes file for 4361; tweak control flow a bit	2011-11-03 12:31:31 -04:00
bug4725	Add a belated changes file for #4725.	2012-02-15 01:25:39 +02:00
bug4760	Set IPV6_V6ONLY on listener sockets bound to IPv6 addresses.	2012-01-31 16:09:49 -05:00
bug4838	When not fetching v2 dir info, don't require it for cleaning descriptors	2012-02-23 13:59:37 -05:00
bug4955	Include compat.h from natpmp-helper to fix build	2012-02-14 23:36:39 +01:00
bug5090	Oops; credit bug5090 patch to flupzor. estebanm only found the bug.	2012-03-09 11:54:27 -05:00
bug5105	Rewrite managed proxy environment setup code	2012-02-17 11:42:20 -05:00
bug5231	Don't cannibalize already cannibalized circuits	2012-02-25 17:59:21 +01:00
bug5340	Fix compile warnings in openbsd malloc	2012-03-08 19:28:59 +01:00
bug5342	Never choose a bridge as an exit. Bug 5342.	2012-03-09 14:27:50 -05:00
bug5343	Require a threshold of exit nodes before building circuits	2012-03-08 15:42:54 -05:00
extra-tests	changes file for extra-tests branch	2012-03-08 21:16:46 -05:00
geoip-march2012	Update to the March 2012 GeoIP database.	2012-03-08 09:35:15 +01:00
maatuska-ip	new ip address for maatuska	2012-02-29 13:22:41 -05:00
tinytest_update	Synchronize with upstream tinytest again: remove _identifiers	2012-02-13 17:45:15 -05:00