commit c4e96a3deea4ca25f219efa4285d486fcc7e7364 Merge: cc7a75dc0 f68aab83b Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 19:20:37 2018 -0400
Merge branch 'maint-0.3.4' into release-0.3.4
changes/bug27226 | 5 ++ src/common/tortls.c | 10 ++-- src/test/test_tortls.c | 122 ++++++++++++++++++++++++------------------------- 3 files changed, 72 insertions(+), 65 deletions(-)