commit 44626b37f6c6bcc1907cd269b8e9bc77909f9d51 Merge: 1bbe75da6 f0dc6c8e2 Author: Nick Mathewson <ni...@torproject.org> Date: Thu May 3 13:38:51 2018 -0400
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
.travis.yml | 4 +++-
Makefile.am | 8 ++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
