commit cd054ceadaa4723f076c7050160424b356b985ca Merge: b0688bb 11c467f Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 6 18:02:03 2012 -0500

Merge branch 'bug7285'

changes/bug7285 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)