[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/279'

[asn at torproject.org]

commit 0ba0d738a84de677166e5bc09b066d353b3612f1
Merge: a81581e6be a82b4eb305
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Feb 2 15:25:22 2021 +0200

    Merge remote-tracking branch 'tor-gitlab/mr/279'

 changes/ticket40232            |  4 ++++
 src/core/mainloop/connection.c |  8 +++++---
 src/core/mainloop/mainloop.c   | 12 ++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)