[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.7' into maint-0.2.8

[nickm at torproject.org]

commit 163cee1b6489c8966681b420d6da49e8ff4a9d1f
Merge: 8d96223 d40e869
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed May 11 13:42:40 2016 -0400

    Merge branch 'maint-0.2.7' into maint-0.2.8

 src/or/dirserv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)