commit f869cd012352310bcae232920d5e1941063e600b Merge: c8a46cda5 0366ae224 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 09:15:56 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-)