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

[nickm at torproject.org]

commit 9c6283732a376b21d110f1ef95b4b2af423a8e59
Merge: 1c47459e5 ef9754327
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 20 07:50:04 2018 -0500

    Merge branch 'maint-0.3.5'

 Makefile.am      | 2 +-
 changes/bug28568 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)