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

commit 3e42004e54054b111068e0a83825b95b7c8ff585 Merge: e03bb35f9 8dc7ad127 Author: Nick Mathewson Date: Thu Mar 12 13:42:42 2020 -0400 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 src/test/test_options.c | 19 --- 1 file changed, 12 insertions(+), 7

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

commit e03bb35f90f28ae21b9c9e80b5af9a689af9e1dc Merge: f0646919a b755a489b Author: Nick Mathewson Date: Thu Mar 12 12:45:56 2020 -0400 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 Conflicts: src/app/config/config.c changes/ticket33361 | 3