From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 12 Aug 2013 13:47:17 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.4'
X-Git-Tag: tor-0.2.5.1-alpha~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d706dd27a9d439175051ab5977e0474d669fde2;p=thirdparty%2Ftor.git

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

5d706dd27a9d439175051ab5977e0474d669fde2