commit 18df0ffbf3856e341d4df3e46d9cc8e324154826 Merge: 1ba17cc81 763ccd092 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 14 07:45:58 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 Doxyfile.in | 2 +- changes/bug28435 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)