From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 14 Jun 2013 01:59:27 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=483385d2bdd391db2ecbb775935554558dba7b56;p=thirdparty%2Ftor.git

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

483385d2bdd391db2ecbb775935554558dba7b56