From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 10 Mar 2015 12:36:53 +0000 (-0400)
Subject: Merge commit 'origin/maint-0.2.6^'
X-Git-Tag: tor-0.2.7.1-alpha~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e732ec295db714d84cc419be69764b10a302b633;p=thirdparty%2Ftor.git

Merge commit 'origin/maint-0.2.6^'
---

e732ec295db714d84cc419be69764b10a302b633