commit 57f05c318d25c98b0447d19e18c82b1bb6f4248c Merge: 139a81c 5833861 Author: Roger Dingledine arma@torproject.org Date: Tue Sep 11 14:18:14 2012 -0400

Merge branch 'maint-0.2.3' into release-0.2.3

changes/bug6801 | 5 +++++ changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/or/rephist.c | 3 ++- src/test/test_util.c | 13 +++++++++++++ 8 files changed, 45 insertions(+), 19 deletions(-)