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

[nickm at torproject.org]

commit 339ff694a74a7be2a34525ffef83d29547b7e847
Merge: f57fd0318 3c691613c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Nov 2 11:29:00 2018 -0400

    Merge branch 'maint-0.3.5'

 ChangeLog    | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ReleaseNotes | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 336 insertions(+)