commit cb7fff193e2749f241e646b155de3ee33623606e Merge: 0a4649e 0e8949a Author: Roger Dingledine arma@torproject.org Date: Sat May 21 18:14:16 2011 -0400

Merge branch 'maint-0.2.2'

changes/bug1810 | 6 ++++++ src/common/util.c | 2 +- src/or/circuitbuild.c | 2 +- src/or/config.c | 2 +- src/or/router.c | 1 - 5 files changed, 9 insertions(+), 4 deletions(-)