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

commit 2240aa1269b0b72bff678eaa3f144f8ebb3d3931 Merge: a9993a9 13a8571 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 22 13:17:58 2016 -0500 Merge branch 'bug16023_028_01_squashed' changes/bug16023 | 4 ++++ src/or/control.c | 14 ++++++++++---- src/or/control.h | 5 ++++- src/or/directory.c | 7 ++++++- 4 files changed, 24 insertions(+), 6 deletions(-)