commit 5190ec0bc4c22d7bab756e21db6e357ba07379c4 Merge: 6e7cbfc b0767e8 Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 26 11:06:41 2014 -0400

Merge remote-tracking branch 'public/require_some_c99'

changes/require-c99 | 10 ++++++++++ configure.ac | 25 ++++++++++++++++++++++++- src/common/address.c | 10 ++++------ 3 files changed, 38 insertions(+), 7 deletions(-)