Merge remote-tracking branch 'dgoulet/bug15963_026_01'
commiteb71777bb28b353da68c0ea25a36d0ac763de550
authorNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 20:00:07 +0000 (2 16:00 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 20:00:07 +0000 (2 16:00 -0400)
treeeaa904a3b9d8cab7e1ec851235e7afc5cb50c32d
parentbc64a6b2b9c1e0851ce4fc4fe410ac565f3c0137
parentd6bfedb8e56ae3d2fc249852de477a61eb6a1278
Merge remote-tracking branch 'dgoulet/bug15963_026_01'
src/or/dirserv.c