From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 24 Aug 2012 16:51:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.1-alpha~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6864a44a4a6372c909ed8ea308881e4e8420046e;p=thirdparty%2Ftor.git

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

6864a44a4a6372c909ed8ea308881e4e8420046e