commit 9323f5d1d45f46e55f565fff59a4595954328219 Merge: d50f90bfc 90f6c590a Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 23 20:07:47 2018 -0400

Merge branch 'maint-0.3.4'

.appveyor.yml | 3 --- changes/ticket27275 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)