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

[nickm at torproject.org]

commit db61ae2c84648db75c949f36d7dc2ee95fe7255b
Merge: 50911dd 8936c50
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 08:41:35 2017 -0500

    Merge branch 'maint-0.2.6' into release-0.2.6

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