commit 4d2c8ca33858bbf360fb4423331dc8fdd363b8ea Merge: 3479024cb f751cc020 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 28 07:31:42 2019 -0400 Merge branch 'config_macros_doc_cleanup' src/lib/conf/confmacros.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)