commit 8221b5d587d6ae6b7d57d10b0ec9ea78e0c57651 Merge: 0015d0084 90ce8d0a5 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Dec 2 19:38:40 2018 -0500 Merge remote-tracking branch 'tor-github/pr/559' doc/tor.1.txt | 4 ---- src/feature/nodelist/routerlist.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-)