[tor-commits] [tor/master] Merge branch 'tor-github/pr/1217'

[asn at torproject.org]

commit 60adebc4996797de4c179f489d840af9feff60e2
Merge: 4185ef29f 320f5068a
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Aug 19 18:07:48 2019 +0300

    Merge branch 'tor-github/pr/1217'

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