From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 27 Feb 2016 09:17:51 +0000 (+0100)
Subject: Merge branch 'bug18392'
X-Git-Tag: tor-0.2.8.2-alpha~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a276947ba6a04d303f59630b744045459d94504;p=thirdparty%2Ftor.git

Merge branch 'bug18392'
---

0a276947ba6a04d303f59630b744045459d94504