[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

[asn at torproject.org]

commit 357e9a6f2c88b99e85e65c0401c524adbe921665
Merge: 90f4ed233 190386f1c
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 27 11:49:36 2019 +0300

    Merge branch 'maint-0.3.5' into maint-0.4.0

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