commit 81e0fd8360d66a8e9901a50ca2245ffedc89fc3c Merge: 8afbc15 50049df Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 10 15:14:49 2015 -0400

Merge remote-tracking branch 'public/feature16734'

configure.ac | 2 ++ src/common/compat.c | 42 ++++++++++++++++++++++++++++++++++++++++++ src/common/compat.h | 2 ++ src/test/test_util.c | 25 +++++++++++++++++++++++++ 4 files changed, 71 insertions(+)