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

[nickm at torproject.org]

commit 586c3a7c902dfb6fdf52390ecb2a08d6fceef77a
Merge: a6a7a1f3e 9daf06d17
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 14 07:42:56 2018 -0500

    Merge branch 'maint-0.3.5'

 doc/tor.1.txt                   | 4 +---
 src/core/or/circuitbuild.c      | 5 ++---
 src/feature/nodelist/nodelist.c | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)