From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 9 Jul 2015 16:53:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'yawning/feature16467_9663'
X-Git-Tag: tor-0.2.7.2-alpha~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6a0759e3a34a3c78850ee2a73dbc0124ba7aa4a;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'yawning/feature16467_9663'
---

a6a0759e3a34a3c78850ee2a73dbc0124ba7aa4a