From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 24 Oct 2012 01:48:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
X-Git-Tag: tor-0.2.3.24-rc~7^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b0646cc1423d4ea28d68c84e38e90ba8a6cb4e29;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
---

b0646cc1423d4ea28d68c84e38e90ba8a6cb4e29