[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/221'

[dgoulet at torproject.org]

commit fd8097978607629c3e25a8db0c91ac20ce7086fb
Merge: 94fc207d42 eaf814bd50
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Nov 24 10:26:17 2020 -0500

    Merge branch 'tor-gitlab/mr/221'

 src/core/or/command.c       | 2 +-
 src/feature/stats/rephist.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)