From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 9 Oct 2013 13:45:21 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.2-alpha~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=882fb8383da941ec8bec7a698caacd5924f25892;p=thirdparty%2Ftor.git

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

882fb8383da941ec8bec7a698caacd5924f25892