commit 3e64553f769a4d2536c9f0ac0ad289cf9c41826d Merge: 2420e84ba 1ea312718 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 3 09:02:39 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/ticket28973 | 6 ++++++ src/common/tortls.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- src/or/connection_or.c | 17 ++++++++++------- 3 files changed, 61 insertions(+), 8 deletions(-)