From: Roger Dingledine <arma@torproject.org>
Date: Thu, 25 May 2017 04:28:11 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0'
X-Git-Tag: tor-0.3.1.2-alpha~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=657297a9f8bedfab2dadfaee53768a1f9b8a558e;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0'
---

657297a9f8bedfab2dadfaee53768a1f9b8a558e