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

[asn at torproject.org]

commit dbbd60331352da8f985ddfc988fbe5f97e3f23af
Merge: a7ca089343 3d993d4d85
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jan 27 15:43:01 2021 +0200

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

 changes/bug40235        | 5 +++++
 src/app/config/config.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)