From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 2 Feb 2017 13:48:20 +0000 (-0500)
Subject: Merge branch 'bug21294_030_01_squashed'
X-Git-Tag: tor-0.3.0.3-alpha~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b11f00c153dc6e107642258e1efe5a6daf641925;p=thirdparty%2Ftor.git

Merge branch 'bug21294_030_01_squashed'
---

b11f00c153dc6e107642258e1efe5a6daf641925