commit 59deac92a1b9bea4c1340c7aa533e3105c7df266 Merge: 5ee0fda 97dbff5 Author: Roger Dingledine arma@torproject.org Date: Wed Sep 5 16:46:23 2012 -0400

Merge branch 'maint-0.2.3' into release-0.2.3

changes/bug6774 | 4 ++++ doc/tor.1.txt | 4 ++-- src/or/circuitbuild.c | 6 ++++++ 3 files changed, 12 insertions(+), 2 deletions(-)