commit bfe8f50cc80acaf17ded5f2a01fdd8ced0db6ace Merge: f288f2478 6bd069630 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 2 09:06:37 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/bug26470 | 4 ++++ src/or/connection_edge.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)