commit a7cbbf279ef8ab727ff3603940575c6d948985dc Merge: 4e4f93d36 9dc53bc68 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Jan 3 21:31:08 2019 -0500 Merge branch 'ticket28852' changes/ticket28852 | 4 ++++ src/feature/dirparse/parsecommon.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-)