From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 28 Apr 2015 14:19:16 +0000 (-0400)
Subject: Merge branch 'feature6411_v4'
X-Git-Tag: tor-0.2.7.1-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24f170a11f59e26dec3a24d076b749c8acc793ca;p=thirdparty%2Ftor.git

Merge branch 'feature6411_v4'
---

24f170a11f59e26dec3a24d076b749c8acc793ca