commit e1d3b444952d861e4fbe01b5a9b0bd2985892f41 Merge: f45e1fb 17a9607 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 18 23:17:57 2013 -0400

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

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