commit 55474b9d992a531ad05f8efae6b6494bf7129b8f Merge: 0d51da0a1 ed62f0fa1 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 3 09:02:40 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket28973 | 6 ++++++ src/core/or/connection_or.c | 16 +++++++++------ src/lib/tls/tortls_openssl.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 61 insertions(+), 7 deletions(-)