[tor-commits] [tor/master] Merge branch 'handles_squashed'

commit 520799f0846a2f32396fbbbea94a00fbe633c9d8 Merge: 94e3555 e015f7c Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 19 14:08:05 2016 -0400

Merge branch 'handles_squashed'

src/common/handles.h | 153 ++++++++++++++++++++++++++++++++++++++++++++++++ src/common/include.am | 1 + src/test/include.am | 1 + src/test/test.c | 2 + src/test/test.h | 2 +- src/test/test_handles.c | 95 ++++++++++++++++++++++++++++++ 6 files changed, 253 insertions(+), 1 deletion(-)