[tor-commits] [tor/master] Merge branch 'bug12191_squashed'

[nickm at torproject.org]

commit cfca2a6037c139a82677a0ba2776d4ddf6ca6d04
Merge: bbb1ffe f9f450d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 13 08:40:59 2014 -0400

    Merge branch 'bug12191_squashed'

 changes/bug12191 |    7 +++++++
 src/or/command.c |   53 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 35 insertions(+), 25 deletions(-)