[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/410'

[nickm at torproject.org]

commit 9b2d179d9537b2f3e3275d22f014cf7385349553
Merge: b9f6eb68d9 16e517245b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 8 14:17:54 2021 -0400

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

 src/config/torrc.minimal.in-staging | 2 +-
 src/config/torrc.sample.in          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)