[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug3472_act2'

commit 093e6724c7c64c4472cf5426db0e34b650aa2f44 Merge: cb8059b d4ba301 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 25 16:00:31 2011 -0500

Merge remote-tracking branch 'asn/bug3472_act2'

changes/bug3472 | 7 + src/common/util.c | 95 ++++++++++++---- src/common/util.h | 20 +++- src/or/transports.c | 327 +++++++++++++++++++++++++++++++++++++++++---------- src/or/transports.h | 7 +- 5 files changed, 365 insertions(+), 91 deletions(-)