commit d8409ccb76e1902e81f8f2c7d62babe64efd3e84 Merge: 9b4ecbaa7 78bfe731c Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 7 08:34:15 2019 -0500

Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0

.appveyor.yml | 23 +++++++++++++++++++++-- changes/bug29601 | 6 ++++++ 2 files changed, 27 insertions(+), 2 deletions(-)