commit ad8b9dcd4713133fe840608e1ea98b09af6bc85a Merge: 60e9e48 163cee1 Author: Roger Dingledine <arma@torproject.org> Date: Wed May 11 13:43:06 2016 -0400 Merge branch 'maint-0.2.8' src/or/dirserv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)