Merge branch 'bug2081_followup_022' into maint-0.2.2
commitf924fbf19f1244eed568bc799f77d8fb288c801d
authorNick Mathewson <nickm@torproject.org>
Tue, 7 Dec 2010 16:35:49 +0000 (7 11:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 7 Dec 2010 16:35:49 +0000 (7 11:35 -0500)
tree2b51f2a02033d67d26a755b9346063d1c1193603
parentdc2f10bd81cfcfdd65bad38a34c042259b1c1ece
parent5efe6f04c68debe6ef9307d0ed98f67ed5ca5f46
Merge branch 'bug2081_followup_022' into maint-0.2.2
src/or/dirserv.c