commit 4010427b519c3727351905bbe5a75e85a055dd58 Merge: 5693fed df3cf88 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 28 20:53:44 2011 -0400

Merge remote-tracking branch 'arma/bug3039' into maint-0.2.2

changes/bug3039 | 5 +++++ src/or/circuitbuild.c | 2 +- src/or/config.c | 20 +++++++++++++++++--- src/or/config.h | 1 + 4 files changed, 24 insertions(+), 4 deletions(-)