From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Aug 2014 16:52:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=938deecc876e110d708edda544d20d9fd752838e;p=thirdparty%2Ftor.git

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

938deecc876e110d708edda544d20d9fd752838e