From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 Feb 2012 16:50:10 +0000 (-0500)
Subject: Merge branch 'bug5105-v2-squashed'
X-Git-Tag: tor-0.2.3.13-alpha~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaedcba49315f3fe384c379f30692793ca9da18e;p=thirdparty%2Ftor.git

Merge branch 'bug5105-v2-squashed'

Conflicts:
	src/or/transports.c
---

eaedcba49315f3fe384c379f30692793ca9da18e