commit dd0b8517940a62827498d1f930afa491f0edc612 Merge: e0f4e6a2e 6bd069630 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Nov 2 09:06:37 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26470 | 4 ++++ src/or/connection_edge.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)