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

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

4af88d68b4905beac168adb5f1756d610ff7ed7e