[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug13936_025_v2'

[nickm at torproject.org]

commit eee248bc593ab57cd905195458dd2b64c94e9ac1
Merge: f7e8bc2 3d83907
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 19 09:38:46 2014 -0500

    Merge remote-tracking branch 'dgoulet/bug13936_025_v2'

 changes/bug13936    |    6 ++++++
 src/or/circuituse.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)