commit 0a77d5324fe0686cdc70676361c1f90ff533f8fd Merge: 031ac2a cc1580d Author: Roger Dingledine arma@torproject.org Date: Sun Jan 8 12:17:03 2012 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

src/common/tortls.c | 5 +++++ src/or/dirvote.c | 22 ++++++++++++++++++---- src/or/dirvote.h | 2 ++ src/or/networkstatus.c | 25 ++++++++++++++++++------- src/test/test_dir.c | 12 ++++++++---- 5 files changed, 51 insertions(+), 15 deletions(-)