commit 13ccca69f16a6f9987dc4a5aebd2e2c73bcffb69 Merge: 093f57c ef56f07 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 10:01:48 2017 -0400

Merge branch 'onionskin_refactor_2'

changes/ticket22804 | 4 + src/or/circuitbuild.c | 443 +++++++++++++++++++++++++++----------------------- 2 files changed, 248 insertions(+), 199 deletions(-)