[tor-commits] [tor/maint-0.4.3] Merge branch 'pr1854_squashed' into maint-0.4.3

[teor at torproject.org]

commit f6efb3a184341b5b46c8a565e2ec297d2846e45c
Merge: 2d6f00e45 cd2121a12
Author: teor <teor at torproject.org>
Date:   Thu Apr 9 11:05:59 2020 +1000

    Merge branch 'pr1854_squashed' into maint-0.4.3
    
    Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).

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