[tor-commits] [tor/maint-0.3.5] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit 1fce9d129604ea25db4a697218e961c0dadf0133
Merge: 6b2ff4fff 93b6d4137
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 11 18:05:45 2018 -0500

    Merge branch 'maint-0.3.3' into maint-0.3.4

 src/common/tortls.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)