commit a9db07f3253bb7db23c05fbe0e01ff424a5a45a1 Merge: d598d834f 27b917047 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 15 09:06:18 2018 -0500

Merge branch 'maint-0.3.4' into maint-0.3.5

.appveyor.yml | 21 +++++++++++++++++---- changes/bug28399 | 4 ++++ changes/bug28454 | 4 ++++ 3 files changed, 25 insertions(+), 4 deletions(-)