From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 2 Sep 2014 15:58:08 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~171
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c143f5214b4a2d37dbb47940eaf2cc2e212f86;p=thirdparty%2Ftor.git

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

e3c143f5214b4a2d37dbb47940eaf2cc2e212f86