Nick Mathewson 6a0d809f44 Merge remote-tracking branch 'sebastian/bug5231' %!s(int64=13) %!d(string=hai) anos
..
bug4725 c79aa8f3ac Add a belated changes file for #4725. %!s(int64=13) %!d(string=hai) anos
bug4838 f7e87f41f7 When not fetching v2 dir info, don't require it for cleaning descriptors %!s(int64=13) %!d(string=hai) anos
bug4955 19b4df0d46 Include compat.h from natpmp-helper to fix build %!s(int64=13) %!d(string=hai) anos
bug5105 bf1ce3f53d Rewrite managed proxy environment setup code %!s(int64=13) %!d(string=hai) anos
bug5231 2755b09c52 Don't cannibalize already cannibalized circuits %!s(int64=13) %!d(string=hai) anos
maatuska-ip e21756908f new ip address for maatuska %!s(int64=13) %!d(string=hai) anos
tinytest_update 9efee31fae Synchronize with upstream tinytest again: remove _identifiers %!s(int64=13) %!d(string=hai) anos