commit 06f0c1aa6a4ad0a6dfc93b1637214c307feed566 Merge: 5cf725e bc91cb6 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 1 12:56:14 2011 -0400 Merge branch 'cov217_022_squashed' into maint-0.2.2 src/or/dirserv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)