commit d8ff7d0236d46621822162a2fbd21c8c97b4880a
Merge: f23d4df09 b33f3c960
Author: Nick Mathewson <[email protected]>
Date: Thu Nov 21 07:49:18 2019 -0500
Merge branch 'reversible_3'
changes/ticket27992 | 5 +
doc/tor.1.txt | 8 +-
scripts/maint/practracker/exceptions.txt | 2 +-
src/app/config/config.c | 656 ++++++++++++++++++++++---------
src/app/config/config.h | 10 +-
src/test/conf_examples/controlsock/error | 1 +
src/test/conf_examples/controlsock/torrc | 1 +
src/test/include.am | 1 +
src/test/test.c | 1 +
src/test/test.h | 1 +
src/test/test_options_act.c | 272 +++++++++++++
11 files changed, 759 insertions(+), 199 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
