[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit c7f09554eb0bb3dc9413adb255a45e4e94add1ef
Merge: 586c3a7c9 763ccd092
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 14 07:45:58 2018 -0500

    Merge branch 'maint-0.3.5'

 Doxyfile.in      | 2 +-
 changes/bug28435 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)