From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 17:39:38 +0000 (-0400)
Subject: Merge branch 'ticket16698_v2'
X-Git-Tag: tor-0.2.9.1-alpha~255
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60e9e484487b1163bc531b72597ee24741ce4df0;p=thirdparty%2Ftor.git

Merge branch 'ticket16698_v2'
---

60e9e484487b1163bc531b72597ee24741ce4df0