commit a50690e68f8a332321e88f0ac8c3046186bc1c1f Merge: 4a2a1e5 cbf9e74 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 6 11:52:22 2014 -0500

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

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