commit 0f637492e30e19ad7abeedafdd58c087f01b4527 Merge: 8b01fd7 b231026 Author: Nick Mathewson nickm@torproject.org Date: Sun Mar 6 13:35:42 2011 -0500

Merge branch 'careful_with_all_descs' into maint-0.2.1

changes/all_descs | 4 ++++ src/or/dirserv.c | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-)