commit 03e4b5a9d7ab918dcd121f0ac4586e798e7ff5b0 Merge: d984716 ce553d4 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 4 10:31:25 2012 -0400 Merge remote-tracking branch 'linus/bug6757' changes/6757 | 5 +++++ src/or/circuitbuild.c | 12 +++--------- src/or/nodelist.c | 19 ++++++++++++------- 3 files changed, 20 insertions(+), 16 deletions(-)