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

[nickm at torproject.org]

commit efab3484e6ea3a799ccf61061450cfc35791ad41
Merge: 35699ef 8828794
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 30 20:25:15 2014 -0400

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

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