commit 5c3998a02773af87a27265bf9e4d936cc07cc9d1 Merge: 1b5c9a580 d0007db1f Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 23 20:44:16 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug26979 | 4 ++ scripts/test/appveyor-irc-notify.py | 83 ++++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 28 deletions(-)