From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 11 May 2016 18:12:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug18815'
X-Git-Tag: tor-0.2.9.1-alpha~252
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e3a4511049162b2560b80a70c6c2596fcb34dd34;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug18815'
---

e3a4511049162b2560b80a70c6c2596fcb34dd34