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

[asn at torproject.org]

commit 4b9ed14d9bba7b6f5892bbbbcbf81c3e2414c65b
Merge: 935160ce86 1d0695fe7e
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 25 15:02:04 2020 +0300

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

 changes/bug19431        |  6 ++++++
 src/lib/log/ratelim.c   | 12 +++++++++---
 src/lib/log/ratelim.h   |  8 +++++++-
 src/test/test_logging.c |  6 +++++-
 4 files changed, 27 insertions(+), 5 deletions(-)