commit b5a306e82c684bdd30b832fdfd9e2b55c06b54ae Merge: 40a87c4 e5e4bfd Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 27 09:30:13 2011 -0500

Merge branch 'safer_params_squashed'

changes/proposal178 | 6 ++++ src/or/dirvote.c | 32 ++++++++++++++++----- src/or/dirvote.h | 3 +- src/test/test_dir.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++--- 4 files changed, 104 insertions(+), 13 deletions(-)