commit 2b97b1464bba12d54e1446e70331cea2b904afb7 Merge: 1f19b5528 a1f97bb25 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 21:26:32 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

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