[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 0c3d676f9ea879ec78b442cc9b0c4d0231f0d2b0
Merge: cde1a2c 81a5ee7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 29 03:51:53 2013 -0400

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

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