From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 27 Aug 2012 20:03:48 +0000 (-0400)
Subject: Merge branch 'bug6690_022' into maint-0.2.2
X-Git-Tag: tor-0.2.2.39~2^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c30e6abc93fa086a14d01d838066581a3657285;p=thirdparty%2Ftor.git

Merge branch 'bug6690_022' into maint-0.2.2
---

1c30e6abc93fa086a14d01d838066581a3657285