commit 204a90c935dc8fe4f84c311b09e3481d67c2966d Merge: 80b13f7e1 73ba308d3 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 12 08:17:45 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

.appveyor.yml | 2 +- changes/bug27464 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)