commit 08efa70c41b258d8655ec01bdb721aea96b42d46 Merge: 7de3a19 9583a53 Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 23:29:56 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)