Nick Mathewson eaedcba493 Merge branch 'bug5105-v2-squashed' ...

Conflicts:
	src/or/transports.c

2012-02-17 11:50:10 -05:00

..

bug4725

Add a belated changes file for #4725.

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

tinytest_update

Synchronize with upstream tinytest again: remove _identifiers

2012-02-13 17:45:15 -05:00