[tor-commits] [tor/maint-0.4.2] Merge branch 'bug32240_32242_040' into bug32240_32242_041

[teor at torproject.org]

commit 84c4ede052bc642677d9f53f9802e6d69ca647df
Merge: 4a34fd5b7 d96b35d66
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 09:23:41 2019 +1000

    Merge branch 'bug32240_32242_040' into bug32240_32242_041

 .travis.yml         | 3 +--
 changes/ticket32242 | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)