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

[arma at torproject.org]

commit 29a82b5a8b6d5e75a1f8b880933c2a232458d386
Merge: 2126fea 68a2e4c
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Jul 28 02:47:15 2014 -0400

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/bug1038-3 |    6 ++++++
 changes/bug12718  |    5 +++++
 src/or/command.c  |   20 ++++++++++++++++----
 src/or/control.c  |    2 +-
 4 files changed, 28 insertions(+), 5 deletions(-)