[tor-commits] [tor/master] Merge branch 'doc31089_029' into doc31089_035

[asn at torproject.org]

commit 25f39bdfc4dfdba02b6f5e5f54938413fc53336d
Merge: e83eabc9b 1087c48d6
Author: teor <teor at torproject.org>
Date:   Thu Aug 8 23:07:12 2019 +1000

    Merge branch 'doc31089_029' into doc31089_035

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