Nick Mathewson 4aa0aa0300 Merge remote-tracking branch 'origin/maint-0.2.2' ...

Conflicts:
	src/common/Makefile.am
	src/or/Makefile.am

2012-02-12 23:27:31 -05:00

..

bug5065

Properly protect paths to sed, sha1sum, openssl

2012-02-10 20:12:03 +01:00

bug5097

Fix bug #5097: remove bogus envvar from managed proxies' environment

2012-02-12 19:12:51 -05:00