commit 46434ecf5b6f1ad88deb86fdac044c41ae4b534b Merge: 6061cd5 d13389b Author: Roger Dingledine arma@torproject.org Date: Sun Jul 1 17:37:59 2012 -0400

Merge branch 'maint-0.2.3'

changes/bug6252 | 8 -------- src/or/relay.c | 14 -------------- 2 files changed, 0 insertions(+), 22 deletions(-)