[tor-commits] [tor/master] Merge branch 'tor-github/pr/1236'

[dgoulet@xxxxxxxxxxxxxx]

commit 88a8deb420801085cfdbcb147a748a8138124bd3
Merge: 960d98941 360a29e28
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Thu Aug 29 12:58:25 2019 -0400

    Merge branch 'tor-github/pr/1236'

 .travis.yml      | 10 ++++++----
 changes/bug31442 |  3 +++
 configure.ac     |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits