commit 0b6fb5ebcdccd7267e60caf5418b31977c41f12c Merge: 7ac8a4a 21c6c84 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 17 09:50:18 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.3'

changes/bug6377 | 4 ++++ src/or/config.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)