[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit 27853938a19bc6a861a7575ad059982bb5006e6e
Merge: 3e7f13a4e ed62f0fa1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 3 09:02:40 2019 -0500

    Merge branch 'maint-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(-)