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

[nickm at torproject.org]

commit c06b7f090cfe49cef1b174d69277534eb0441696
Merge: 6bd069630 45e0004b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 9 10:49:47 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.3

 changes/bug28245    |  6 ++++++
 configure.ac        |  1 +
 src/common/tortls.c | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)