[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

[nickm at torproject.org]

commit 3727a978b8ca5015c1d684a0151002cd70ab3426
Merge: 43f187e af7970b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Aug 25 00:29:06 2013 -0400

    Merge remote-tracking branch 'public/bug9543' into maint-0.2.4

 changes/bug9543 |    4 ++++
 src/or/config.c |   10 ++++++++++
 2 files changed, 14 insertions(+)