From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 29 Aug 2014 20:45:56 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f113a263deda8e1619f46cd913fc24ac28da832d;p=thirdparty%2Ftor.git

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

f113a263deda8e1619f46cd913fc24ac28da832d