[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit e9f0cdf55fe22a83e5bffd51189fc2e5752669e7
Merge: 7b29838 81a5ee7
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Jul 1 15:08:57 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug9122 |    4 ++++
 changes/bug9147 |    4 ++++
 src/or/config.c |    4 ++++
 src/or/main.c   |    7 +++++++
 4 files changed, 19 insertions(+)