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

[teor at torproject.org]

commit 233ccef6d878253ee4f0cfa4610577101b68e6c6
Merge: 3d6ec40e6 9be51e8a8
Author: teor <teor at torproject.org>
Date:   Tue Nov 12 10:10:01 2019 +1000

    Merge branch 'maint-0.4.2'

 src/test/conf_examples/obsolete_1/expected |  0
 src/test/conf_examples/obsolete_1/torrc    | 68 ++++++++++++++++++++++++++++++
 src/test/conf_examples/obsolete_2/expected |  0
 src/test/conf_examples/obsolete_2/torrc    |  2 +
 4 files changed, 70 insertions(+)