From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 26 Jul 2017 19:37:53 +0000 (-0400)
Subject: Merge branch 'maint-0.3.0' into maint-0.3.1
X-Git-Tag: tor-0.3.1.5-alpha~19^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a907c659378b1748e65f8d94f7d212a91122247;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.0' into maint-0.3.1

This is an "ours" merge to avoid taking any changs from maint-0.3.0:
we don't want to take the travis file, since there is a separate branch
for putting it in 0.3.1 and later.
---

1a907c659378b1748e65f8d94f7d212a91122247