[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug14202_026_v1'

[nickm at torproject.org]

commit 55639bc67f66e0bb41af1474ce8654d49faf9a61
Merge: e78b7e2 80bed1a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 2 10:16:48 2015 -0500

    Merge remote-tracking branch 'dgoulet/bug14202_026_v1'

 changes/bug14202 |    3 +++
 src/or/dirserv.c |    9 +--------
 2 files changed, 4 insertions(+), 8 deletions(-)