[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[arma at torproject.org]

commit d204b04298952373d3f6f89e7153ceeb17053b1c
Merge: 2a824b9 84f47ff
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Sep 11 13:57:24 2012 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug6690      |    7 +++++++
 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/policies.c    |    6 +++++-
 src/test/test_util.c |   13 +++++++++++++
 8 files changed, 50 insertions(+), 19 deletions(-)