[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit 05ec055c417c80bf7b13914fade70a72f11accc5
Merge: 332543b 51675f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:38:59 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/bug17404    | 6 ++++++
 src/common/tortls.c | 4 ++++
 2 files changed, 10 insertions(+)