From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 17 Aug 2012 15:54:05 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3'
X-Git-Tag: tor-0.2.4.1-alpha~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=274e2817419e9b785f890fe04d791ed9114a8725;p=thirdparty%2Ftor.git

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

274e2817419e9b785f890fe04d791ed9114a8725