commit f31b3857febf793a12408dc60cd793fe85778637 Merge: 7892683 114f57b Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 11 10:24:54 2017 -0500

Merge branch 'bug20990_squashed_v2'

.gitignore | 1 + acinclude.m4 | 23 ++++++++++++---------- autogen.sh | 4 ++-- changes/ticket20990 | 4 ++++ configure.ac | 52 ++++++++++++++++++++++++++------------------------ m4/ax_check_sign.m4 | 4 ++-- m4/pc_from_ucontext.m4 | 20 +++++++++---------- 7 files changed, 59 insertions(+), 49 deletions(-)