commit 81a5ee77ec6df66ca9a5044bdf127b11922e0dd9 Merge: ca6aacc c955149 Author: Nick Mathewson nickm@torproject.org Date: Sat Jun 29 03:50:37 2013 -0400

Merge branch 'bug9147' into maint-0.2.4

changes/bug9147 | 4 ++++ src/or/main.c | 7 +++++++ 2 files changed, 11 insertions(+)