commit 291876be36d70e892d8fb5e50509379e69485a02
Merge: 579770b70 967cef2f8
Author: Nick Mathewson <nickm at torproject.org>
Date: Fri Sep 7 08:48:23 2018 -0400
Merge branch 'maint-0.3.4'
.appveyor.yml | 4 +++-
changes/bug27460 | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)