commit 0cfb7f6ce715d1947029c7dd92e6fd79868dc599 Merge: 111f988b5 9be51e8a8 Author: teor <t...@torproject.org> Date: Tue Nov 12 10:09:57 2019 +1000
Merge branch 'maint-0.4.2' into release-0.4.2 changes/bug32295 | 3 ++ src/lib/confmgt/type_defs.c | 39 +++++++++++------ src/lib/confmgt/typedvar.c | 11 ++--- src/lib/confmgt/typedvar.h | 2 +- src/lib/confmgt/var_type_def_st.h | 5 ++- 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 + 9 files changed, 110 insertions(+), 20 deletions(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits