commit be5b4415c2dce243a6249e6ca14b65423c9b0746 Merge: 246765342 6361a250f Author: Nick Mathewson <ni...@torproject.org> Date: Thu May 3 13:38:54 2018 -0400
Merge branch 'maint-0.3.1' into maint-0.3.2
.travis.yml | 4 +++-
Makefile.am | 9 +++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
