From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 24 Oct 2014 13:23:53 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ce57267b4dbb765dc0ce652080b60ecc013703e;p=thirdparty%2Ftor.git

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

1ce57267b4dbb765dc0ce652080b60ecc013703e