commit 10d1ac3f9dda65322b5b9d17e8c7d37de238edf0 Merge: 66cd361 79c4c81 Author: Roger Dingledine arma@torproject.org Date: Thu May 10 16:04:19 2012 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug5760 | 3 +++ changes/bug5786_range | 8 ++++++++ src/common/util.c | 7 +++++++ src/or/control.c | 10 +++++----- src/test/test_util.c | 15 +++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-)