[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

[nickm at torproject.org]

commit c3e94a8ccdea60d460d0095821c1743c0f815367
Merge: a3342b382 a1f97bb25
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 21:26:32 2019 -0400

    Merge branch 'maint-0.4.0' into maint-0.4.1

 changes/doc31089                            |   4 +
 contrib/operator-tools/tor-exit-notice.html | 177 +++++++++++++++++++++++++++-
 2 files changed, 176 insertions(+), 5 deletions(-)