[tor-commits] [tor/master] Merge branch 'bug31463_040' into bug31463_041

[nickm at torproject.org]

commit 7c92f4faa21be4deb03a7ef2e07fb0a15853fed8
Merge: 3b2a73207 8b32d22a0
Author: teor <teor at torproject.org>
Date:   Thu Aug 22 22:10:06 2019 +1000

    Merge branch 'bug31463_040' into bug31463_041

 .travis.yml      | 2 +-
 changes/bug31463 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)