commit 92f71b8e88c58b38c027a291066337f896ad344b Merge: 12175987f a9db07f32 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 15 09:06:18 2018 -0500 Merge branch 'maint-0.3.5' .appveyor.yml | 21 +++++++++++++++++---- changes/bug28399 | 4 ++++ changes/bug28454 | 4 ++++ 3 files changed, 25 insertions(+), 4 deletions(-)