commit cbd71f5c910bd4e4d27b94be105e2f8d3e126896 Merge: 16dec180e 8691046ac Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 22 09:37:31 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/or/connection_edge.c | 1 - src/test/test_tortls.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)