commit cde1a2ca059d892a970c57fc265261125aefe2cb Merge: 10480df ca6aacc Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 24 12:55:29 2013 -0400

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

changes/bug9122 | 4 ++++ src/or/config.c | 4 ++++ 2 files changed, 8 insertions(+)