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

[teor at torproject.org]

commit d7f76b8c47ffd2512b9b454a2af87243e0f68993
Merge: 9343b4120 0650bf369
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 11:19:25 2019 +1000

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug31107         |  4 ++++
 changes/ticket31466      |  5 +++++
 src/or/channeltls.c      | 10 +++++++++-
 src/or/connection_edge.c |  8 +++++---
 4 files changed, 23 insertions(+), 4 deletions(-)