commit 8691046ac668282de421bd66c14748faac693749 Merge: 3cfceeb45 c1ad40627 Author: Nick Mathewson <ni...@torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400
Merge branch 'maint-0.3.2' into maint-0.3.3
src/or/connection_edge.c | 1 -
src/test/test_tortls.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
