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

[nickm at torproject.org]

commit 85526a5a1f82eba726ba37e47954e16f6b753699
Merge: daf79d4b2 3e64553f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 3 09:02:39 2019 -0500

    Merge branch 'maint-0.3.4' into release-0.3.4

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