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

Merge branch 'bug21372_squashed'
---

bc9121d5c99de17b350c2e4f646160b53f1c832c