[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

commit 68acfefbdb7a25ac1585c9480a8c98cadca50b7a Merge: ced06a8 bc44393 Author: Nick Mathewson nickm@torproject.org Date: Sun May 15 20:12:20 2011 -0400

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

src/common/container.h | 2 +- src/common/di_ops.h | 1 + src/or/config.c | 7 ++++--- src/or/dirvote.c | 13 ++++++++----- src/or/routerlist.c | 9 +++++---- 5 files changed, 19 insertions(+), 13 deletions(-)