Nick Mathewson 6a0d809f44 Merge remote-tracking branch 'sebastian/bug5231'

2012-02-29 15:16:15 -05:00

..

bug4725

Add a belated changes file for #4725.

2012-02-15 01:25:39 +02: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

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

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