commit 5919e8e561d3abb3e74b92ac1b95f05243bb9372 Merge: e6d61ee aed93f8 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 10:29:34 2012 -0400

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

changes/bug6490 | 4 ++++ src/or/config.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-)