From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 20 Feb 2015 06:05:21 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.7.0-root~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03a4e97c76b2021ec7246da03fb31d337fb50f9b;p=thirdparty%2Ftor.git

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

03a4e97c76b2021ec7246da03fb31d337fb50f9b