[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

[nickm at torproject.org]

commit be6b30e642eafc8ad9552e08ab117ac2a9900623
Merge: b0399c602 8dd89e433
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 9 09:59:54 2020 -0400

    Merge branch 'maint-0.4.4'

 changes/ticket33796     |  7 +++++++
 doc/tor.1.txt           | 16 +++++++---------
 src/app/config/config.c |  2 +-
 src/test/test_config.c  |  2 --
 4 files changed, 15 insertions(+), 12 deletions(-)