Merge remote-tracking branch 'asn/bug3594_rebased_and_fixed'

Conflicts:
	src/common/util.c
	src/or/entrynodes.h
This commit is contained in:
Nick Mathewson
2013-03-19 13:25:45 -04:00
14 changed files with 685 additions and 89 deletions
+3
View File
@@ -0,0 +1,3 @@
o Major bugfixes:
- Add support for passing arguments to managed pluggable transport
proxies. Implements ticket #3594.