commit b1350d27977c0fa57c351a18e630a1e20fb70a08 Merge: c7ca7a938 b390983b2 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 10:01:31 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

.appveyor.yml | 15 ++++++++++++++- changes/ticket27430 | 4 ++++ changes/ticket27449 | 3 +++ 3 files changed, 21 insertions(+), 1 deletion(-)