From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 15 Mar 2013 15:18:58 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed600832d9fcd9ac6b2aacd36114f65ff227daf9;p=thirdparty%2Ftor.git

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

ed600832d9fcd9ac6b2aacd36114f65ff227daf9