sengler/tor-parallel-relay-conn @ 1d36693570e5e2994a05b8860a4fceaf81be306a

Nick Mathewson eaedcba493 Merge branch 'bug5105-v2-squashed'		%!s(int64=13) %!d(string=hai) anos
..
bug4725	c79aa8f3ac Add a belated changes file for #4725.	%!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
tinytest_update	9efee31fae Synchronize with upstream tinytest again: remove _identifiers	%!s(int64=13) %!d(string=hai) anos