commit 31be66ea5ae243644f79d7f8a7d728cd9537c79d Merge: 832d463 fc58c37 Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 16 09:40:56 2017 -0500

Merge remote-tracking branch 'meejah/ticket-21329-onions-current'

changes/bug21329 | 3 +++ src/or/control.c | 13 +++++++------ src/or/control.h | 5 +++++ src/test/test_controller.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+), 6 deletions(-)