commit 732ea9120c9db5d6368cba6f2b789aa4fca5db31 Merge: 056003d60 0366ae224 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 09:15:56 2018 -0400
Merge branch 'maint-0.3.2' into maint-0.3.3
changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)