[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/312'

[nickm@xxxxxxxxxxxxxx]

commit 7852499812a4bbe707ff0da065a853de69be2c4d
Merge: 75ad1a1f2 1e296bc6d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Sep 11 14:05:16 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/312'

 changes/ticket8415       | 4 ++++
 src/core/mainloop/main.c | 5 +++++
 2 files changed, 9 insertions(+)

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