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

[nickm at torproject.org]

commit 9f6589d65a26388ac4a8e73a9b6e00a0472bac0b
Merge: d004f06 061586e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 8 08:33:28 2016 -0500

    Merge branch 'decorated_ipv6_directory_send_command_squashed'

 src/or/directory.c | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)