commit 1ec429d07deff782c4fd8ffb931942185f9e8f0f Merge: c103ce9 27df23a Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 3 09:44:31 2017 -0500

Merge remote-tracking branch 'dgoulet/bug20980_030_01'

changes/bug20980 | 4 ++++ configure.ac | 4 ---- src/common/backtrace.c | 2 +- src/common/torgzip.c | 2 +- src/common/util.c | 2 +- src/ext/csiphash.c | 4 ++-- src/ext/trunnel/trunnel.c | 2 +- src/or/config.c | 2 +- src/or/connection_edge.c | 2 +- src/or/directory.c | 2 +- src/test/test-memwipe.c | 2 +- src/test/test_options.c | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-)