From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 12 Nov 2014 20:32:15 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.2-alpha~88
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c813f6ca1d6e385cfad5219108f8ac00677cf35;p=thirdparty%2Ftor.git

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

5c813f6ca1d6e385cfad5219108f8ac00677cf35