From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 Feb 2017 13:40:05 +0000 (-0500)
Subject: Merge remote-tracking branch 'ahf/ahf/bugs/21266'
X-Git-Tag: tor-0.3.0.3-alpha~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc3e742b5b804c9ab12c6bd878551b03dfc24ba9;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'ahf/ahf/bugs/21266'
---

fc3e742b5b804c9ab12c6bd878551b03dfc24ba9