[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2

[arma at torproject.org]

commit 9583a534ac8801211b6c171c399f1ea6bb3cce1c
Merge: ab1460f 66339f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 4 23:18:47 2011 -0400

    Merge remote-tracking branch 'rransom/bug3106' into 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(-)