commit aed93f8ad918787ea787061106bcd5289c712823 Merge: d9bd0de 2bd4521 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 31 10:28:43 2012 -0400

Merge branch 'bug6490_v2' into maint-0.2.3

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