commit 2b3dc3384c41a1e8961b9303b5fa533edf4922c3 Merge: ee33bf5ee b1083584c Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 11 10:38:10 2019 -0500

Merge branch 'ticket32385'

Doxyfile.in | 4 ++-- changes/ticket32385 | 6 ++++++ configure.ac | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-)