commit df6c475e59d24a1e81db846e8fd2343050b6b583 Merge: 92139b0 954eeda Author: Nick Mathewson <nickm@torproject.org> Date: Fri Dec 16 10:27:27 2016 -0500 Merge remote-tracking branch 'public/ticket19142' changes/19142 | 3 +++ configure.ac | 16 ---------------- src/common/compat.c | 9 --------- 3 files changed, 3 insertions(+), 25 deletions(-)