From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 29 Jun 2013 07:51:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c3d676f9ea879ec78b442cc9b0c4d0231f0d2b0;p=thirdparty%2Ftor.git

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

0c3d676f9ea879ec78b442cc9b0c4d0231f0d2b0