[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6

[nickm at torproject.org]

commit fb0de57ba28d92421748cd3db54221c0813fdb0e
Merge: 42d877f 98822df
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 9 13:05:27 2015 -0400

    Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6

 changes/feature15006 |    4 ++++
 src/or/control.c     |   15 +++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)