From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 10 Jun 2013 16:28:30 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c300720bfa107a54c2ce98a6937c0ce192673732;p=thirdparty%2Ftor.git

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

c300720bfa107a54c2ce98a6937c0ce192673732