commit 1ba17cc8152d0e0580a1fb76b4187c4ee2d1d7ef Merge: c45e2f805 9daf06d17 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 14 07:42:56 2018 -0500 Merge branch 'maint-0.3.5' into release-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(-)