commit 597433bcec3cc8270dec810fe82d8accc85931ef Merge: aa45e82 5044cb9 Author: Nick Mathewson <[email protected]> Date: Wed Jan 12 12:37:51 2011 -0500
Merge branch 'bug2346' into maint-0.2.2
changes/bug2346 | 6 ++++++
src/or/config.c | 9 ++++++++-
2 files changed, 14 insertions(+), 1 deletions(-)
