commit 39cf575ed47bf9ff65ad9a2f85f5b7bc0f1d9840 Merge: 5f3233ce1 85accdf00 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 17 08:25:11 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1416' Doxyfile.in | 9 ++++++--- src/core/include.am | 2 +- src/feature/dirparse/authcert_members.h | 29 +++++++++++++++++++++++++++++ src/feature/dirparse/authcert_members.i | 13 ------------- src/feature/dirparse/authcert_parse.c | 3 ++- src/feature/dirparse/ns_parse.c | 3 ++- 6 files changed, 40 insertions(+), 19 deletions(-)