Nick Mathewson 3fc3ed50a1 Merge remote-tracking branch 'public/bug4361' 12 gadi atpakaļ
..
bug4361 248b967ce6 Add comments and changes file for 4361; tweak control flow a bit 12 gadi atpakaļ
bug4725 c79aa8f3ac Add a belated changes file for #4725. 12 gadi atpakaļ
bug4760 dd68d596cd Set IPV6_V6ONLY on listener sockets bound to IPv6 addresses. 12 gadi atpakaļ
bug4838 f7e87f41f7 When not fetching v2 dir info, don't require it for cleaning descriptors 12 gadi atpakaļ
bug4955 19b4df0d46 Include compat.h from natpmp-helper to fix build 12 gadi atpakaļ
bug5105 bf1ce3f53d Rewrite managed proxy environment setup code 12 gadi atpakaļ
bug5231 2755b09c52 Don't cannibalize already cannibalized circuits 12 gadi atpakaļ
bug5340 fe50b676bc Fix compile warnings in openbsd malloc 12 gadi atpakaļ
geoip-march2012 c5d7ee714f Update to the March 2012 GeoIP database. 12 gadi atpakaļ
maatuska-ip e21756908f new ip address for maatuska 12 gadi atpakaļ
tinytest_update 9efee31fae Synchronize with upstream tinytest again: remove _identifiers 12 gadi atpakaļ