[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug15546'

[nickm at torproject.org]

commit 372aef8981f383db8962fbbe67f4d18b56d3740d
Merge: c389447 d59c406
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 23 09:50:29 2015 -0400

    Merge remote-tracking branch 'public/bug15546'

 changes/bug15546 |    4 ++++
 src/or/control.c |    9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)