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

[nickm at torproject.org]

commit c1ad40627bbccf2682f56053c77ff719c822cbce
Merge: a5bbe3f1d 9068e2fa2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 22 09:37:31 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 src/or/connection_edge.c | 1 -
 src/test/test_tortls.c   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)