From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Feb 2017 14:09:58 +0000 (-0500)
Subject: Merge branch 'bug21242'
X-Git-Tag: tor-0.3.0.3-alpha~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78011bb7bace31ecba7dff5e07d84306bf98698c;p=thirdparty%2Ftor.git

Merge branch 'bug21242'
---

78011bb7bace31ecba7dff5e07d84306bf98698c