commit 8400bccb165d6786085566fd1fbe5e65505298f3 Merge: f8aad4a54 2000d04cb Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 17 13:02:23 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

changes/ticket28089 | 6 ++++++ src/or/connection.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)