commit 8b32d22a072a334917fba8569042ff61d7026d27 Merge: 90f4ed233 190386f1c Author: teor teor@torproject.org Date: Thu Aug 22 22:10:00 2019 +1000

Merge branch 'bug31463_035' into bug31463_040

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