commit 22605529b4a32a70d79b4de2e4b44a2e9b2fac1d Merge: 324e01372 967460389 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 21:26:31 2019 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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