commit e0b1fd4d3da05701c0970dabd93010d6c7550d43 Merge: 7bc9f93 e0c937f Author: Nick Mathewson nickm@torproject.org Date: Tue May 2 20:42:00 2017 -0400

Merge branch 'refactor_dir_client_handler'

changes/refactor_reached_eof | 5 + src/or/directory.c | 1092 ++++++++++++++++++++++++++---------------- 2 files changed, 674 insertions(+), 423 deletions(-)