commit a1f97bb25301811aa8dab7b250fb38918cee9332 Merge: ef3543558 50b45c43e Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 21:26:31 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

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