[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

[nickm at torproject.org]

commit 90283f0db39349807614b6a7ed510084e3bb8527
Merge: 1421f75 6747c62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 27 11:23:02 2017 -0500

    Merge branch 'maint-0.3.0'

 changes/bug21420    |  3 +++
 src/common/tortls.c | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)