commit 561e9becbd1f896c31112ab2dfd56fe7badc9382 Merge: fd1c2a1 41200b4 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 8 16:48:50 2013 -0500 Merge remote-tracking branch 'public/signof_enum' Makefile.am | 2 + autogen.sh | 2 +- changes/signof_enum | 7 ++++++ configure.ac | 34 ++++++++++++------------------- m4/ax_check_sign.m4 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/common/compat.h | 3 +- src/win32/orconfig.h | 1 + 7 files changed, 79 insertions(+), 24 deletions(-)