commit 21ee765df0a2f20b6de21af0f4e10dc80d6fd68b Merge: 644ec835d 2ff706ba0 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 12 09:16:12 2017 -0500

Merge remote-tracking branch 'teor/log24558'

configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)