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

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

16f7851807995fd2b42f15b1303c8431d0f7ba38