commit b2083cba9eb842ae7e85063d5751ddddc7302acb Merge: c9081bd 1e553b6 Author: Nick Mathewson nickm@torproject.org Date: Mon May 2 13:55:00 2016 -0400

Merge remote-tracking branch 'dgoulet/bug13239_029_01'

changes/bug13239 | 4 ++++ src/or/circuituse.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)