commit 9273887b4dd788d20de6d9cca6aabed25c01eb17 Merge: d07859b 067daf7 Author: teor teor@torproject.org Date: Wed Mar 13 12:13:20 2019 +1000

Merge remote-tracking branch 'tor-github/pr/8/head'

.travis.yml | 199 ++++++++++++++++++++++++++++++++++++++++++++ tools/bootstrap-network.sh | 4 +- tools/test-network.sh | 2 +- torrc_templates/authority.i | 12 +-- 4 files changed, 208 insertions(+), 9 deletions(-)