[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

[nickm at torproject.org]

commit d6552a7a23da31e92e84d1a3b442dfb8acb2df80
Merge: fd2d7c5d1 1ea312718
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 3 09:02:39 2019 -0500

    Merge branch 'maint-0.3.3' into release-0.3.3

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