[tor-commits] [tor/master] Merge remote-tracking branch 'jigsaw/fix-40317_046-saveconf-sandbox-one-backup'

[nickm at torproject.org]

commit 07237b484e051afe93b8115c673f2ffb4864edf0
Merge: de33be6e32 bbd558a6eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 19 11:32:21 2021 -0400

    Merge remote-tracking branch 'jigsaw/fix-40317_046-saveconf-sandbox-one-backup'

 changes/bug40317        |  5 +++++
 src/app/config/config.c | 17 +++++++++--------
 src/app/config/config.h |  3 +++
 src/app/main/main.c     | 22 +++++++++++++++++-----
 4 files changed, 34 insertions(+), 13 deletions(-)