From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 16 Oct 2018 21:33:58 +0000 (-0400)
Subject: Merge branch 'bug27849_redux'
X-Git-Tag: tor-0.3.5.3-alpha~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=56a3cef4d73922a687fa4256938b5c459aada42c;p=thirdparty%2Ftor.git

Merge branch 'bug27849_redux'
---

56a3cef4d73922a687fa4256938b5c459aada42c