commit b406fdae4fff9a6495a9ad319e7f2b565de52ac8 Merge: 56f24889a a4f207517 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 20 13:14:56 2018 -0500 Merge branch 'ticket25341_merged_v2' Makefile.am | 4 +--- configure.ac | 11 ----------- 2 files changed, 1 insertion(+), 14 deletions(-)