commit 702aa8f775591942f276286ab285fcb8fe80d32f Merge: 7b9cb4c47 632e70739 Author: teor teor@torproject.org Date: Thu Oct 17 14:50:28 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
.travis.yml | 87 +++++++++++++++++++++++------------------------------ changes/ticket30860 | 3 ++ changes/ticket31859 | 3 ++ 3 files changed, 43 insertions(+), 50 deletions(-)