From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 19 May 2015 18:59:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.6'
X-Git-Tag: tor-0.2.7.2-alpha~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=32bd533ddac5bd7d594a81119449b3d30206eedd;p=thirdparty%2Ftor.git

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

32bd533ddac5bd7d594a81119449b3d30206eedd