commit 75da2045c552d1855c6227d732420f6417a15f6e Merge: 2f618094d b390983b2 Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 5 10:01:31 2018 -0400

Merge branch 'maint-0.3.4'

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