[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug15760_hard_026_v2'

[nickm at torproject.org]

commit e48f8e5e87603812a6b1844a5fa27bbc44a3543e
Merge: 34edf17 8024f6a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 2 15:08:14 2015 -0400

    Merge remote-tracking branch 'public/bug15760_hard_026_v2'

 configure.ac        |    1 +
 src/common/tortls.c |   11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)