commit 16cfca501ff27dd11daa9dc75ba9f5d99c48bdf5 Merge: 5f182ea 8fc02a8 Author: Nick Mathewson nickm@torproject.org Date: Mon May 30 12:25:07 2011 -0400

Merge branch 'bug1297a' into maint-0.2.2

changes/bug1297a | 16 ++++++++++++++++ src/or/circuituse.c | 11 ----------- src/or/or.h | 5 +++++ src/or/rendclient.c | 11 +++++++++++ 4 files changed, 32 insertions(+), 11 deletions(-)