[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9

[nickm at torproject.org]

commit 967460389a2f5dd70f75dd753a0d9ff97292e5b2
Merge: 484710f25 1087c48d6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 17 21:26:17 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1216' into maint-0.2.9

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