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

[nickm at torproject.org]

commit ceed53c39b19488e3c62f06f79a3e60b0ec38184
Merge: 1abd526 f8baa40
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 7 13:19:57 2015 -0500

    Merge branch 'ticket14128_squashed'

 changes/ticket14128 |    5 +++++
 src/or/control.c    |   50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/or/control.h    |    1 +
 3 files changed, 56 insertions(+)