[tor-commits] [tor/master] Merge branch 'bug4677'

[nickm at torproject.org]

commit c64d5227401a44e8a1fcd85a67356a53b83cff82
Merge: acd8c4f 8f9c847
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 25 10:56:52 2013 -0500

    Merge branch 'bug4677'

 changes/bug4677     |    4 ++
 src/common/tortls.c |  114 +++++++++++++++++++++++++--------------------------
 2 files changed, 61 insertions(+), 57 deletions(-)