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

commit 3a8a92fddd7a21b8e6b0b5a463e86639f1d04fc8 Merge: 5d3f484 1c0a233 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 21 16:47:55 2017 -0400

Merge branch 'callgraph_reduction_v2'

changes/ticket22608 | 6 ++++++ src/or/channel.c | 47 +++++++++++++++++++++++++++++++++-------------- src/or/channel.h | 1 + src/or/channeltls.c | 2 +- src/test/test_channel.c | 30 +++++++++++++++--------------- src/test/test_scheduler.c | 4 ++-- 6 files changed, 58 insertions(+), 32 deletions(-)