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

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

29979082286cc8fa4dadf4e1fcbe85a1aa58d757