Merge branch 'ticket20831_v2'
commit990a863d7ca74c84238791607b6515813b3b5633
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Dec 2016 16:40:19 +0000 (16 11:40 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Dec 2016 16:40:19 +0000 (16 11:40 -0500)
treedb6a28b4668e2029c00029b674e6f08c4c8264bc
parent988b0afbd6bbb97e3ca796a608a4087888f162aa
parent506bd6d47c9c003a94eae7132e83b682a53f0bc9
Merge branch 'ticket20831_v2'
doc/tor.1.txt
src/or/config.c
src/or/directory.c
src/or/entrynodes.c
src/or/or.h
src/test/test_dir.c