[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm at torproject.org]

commit 93b6d4137491cffc906e34dcd3cd4d284ad89e2f
Merge: d0c3723c3 46796623f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 11 18:05:45 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.3

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