From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 5 Jul 2016 23:10:08 +0000 (-0400)
Subject: Merge remote-tracking branch 'teor/bug18456'
X-Git-Tag: tor-0.2.9.1-alpha~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78196c8822ec8dda5df95428dbb4ae96ec4d2b7f;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'teor/bug18456'
---

78196c8822ec8dda5df95428dbb4ae96ec4d2b7f