Merge branch 'bug27738-033' into bug27738-034
commit484b259604175a7cac313346b8574a36c70b66b7
authorTaylor Yu <catalyst@torproject.org>
Wed, 10 Oct 2018 20:13:02 +0000 (10 15:13 -0500)
committerTaylor Yu <catalyst@torproject.org>
Wed, 10 Oct 2018 20:13:02 +0000 (10 15:13 -0500)
treefe2971e4e5d69f8ee3dae212de91d6d390aa624c
parent48182c147b03dcf4ebdac607a3ce6606ab287668
parentcc10873dee71f8250f19e580826f756fa291e197
Merge branch 'bug27738-033' into bug27738-034
.travis.yml