From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 16 May 2012 16:15:35 +0000 (-0400)
Subject: Merge branch 'bug5346_squashed' into maint-0.2.2
X-Git-Tag: tor-0.2.2.36~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd749798a436688cbbe3fc23fe6d4f5041a3e015;p=thirdparty%2Ftor.git

Merge branch 'bug5346_squashed' into maint-0.2.2
---

dd749798a436688cbbe3fc23fe6d4f5041a3e015