Merge branch 'maint-0.2.8'
commitad8b9dcd4713133fe840608e1ea98b09af6bc85a
authorRoger Dingledine <arma@torproject.org>
Wed, 11 May 2016 17:43:06 +0000 (11 13:43 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 11 May 2016 17:43:06 +0000 (11 13:43 -0400)
treec26996acd776d4a09153918870a59dd7f1d794d4
parent60e9e484487b1163bc531b72597ee24741ce4df0
parent163cee1b6489c8966681b420d6da49e8ff4a9d1f
Merge branch 'maint-0.2.8'
src/or/dirserv.c