commit 76be75b36721c18292a315e7a6adcb88950b6f09 Merge: 586a9ea83 9068e2fa2 Author: Nick Mathewson <[email protected]> Date: Wed Aug 22 09:37:31 2018 -0400
Merge branch 'maint-0.2.9' into release-0.2.9
src/or/connection_edge.c | 1 -
src/test/test_tortls.c | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
