commit 73378e9ac1039539d7c510a22aa839f399ee5603 Merge: 8714e98e8 1fce9d129 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Nov 11 18:05:45 2018 -0500 Merge branch 'maint-0.3.4' into release-0.3.4 src/common/tortls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)