[tor-commits] [tor/master] Merge branch 'ticket32099'

[nickm at torproject.org]

commit 8413eec2c74fc518d3cbffc6deb9ae57eaea2a27
Merge: bcbf3b747 593acfabb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 16 10:28:03 2019 -0400

    Merge branch 'ticket32099'

 Doxyfile.in         | 2 +-
 Makefile.am         | 5 +++--
 changes/ticket32099 | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)