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

Merge branch 'maint-0.3.4' into release-0.3.4

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