13 Dec
2016
13 Dec
'16
3:06 p.m.
commit 387de08fb43a7f2ffd8a45a5452f950a99ed56b1 Merge: 56b1190 55d02c0 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 13 18:03:43 2016 -0500
Merge branch 'ticket20960'
changes/ticket20960 | 5 +++++ doc/tor.1.txt | 4 ---- src/or/config.c | 3 +-- src/or/dirserv.c | 8 +------- src/or/or.h | 3 --- src/or/routerlist.c | 14 -------------- src/or/routerlist.h | 1 - 7 files changed, 7 insertions(+), 31 deletions(-)