commit f0415c16001ebfd06aec7a16bdf8677c7a931b65 Merge: e7e33d4 523e920 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 21 13:00:26 2015 -0500 Merge branch 'bug9819' changes/bug9819 | 8 ++++++++ src/or/channel.c | 11 +++++------ src/or/circuitbuild.c | 11 ++++++++++- src/or/circuitbuild.h | 2 +- 4 files changed, 24 insertions(+), 8 deletions(-)