[tor-commits] [tor/master] Merge branch 'decouple_circuit_mark_squashed'

[nickm at torproject.org]

commit f7ccc9b975ae3e6531767c1a56cd85c906292aff
Merge: b370052 8b4e5b7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 12 14:20:24 2015 -0500

    Merge branch 'decouple_circuit_mark_squashed'

 changes/decouple_circuit_mark |    6 ++++
 src/or/circuitlist.c          |   77 ++++++++++++++++++++++++++++++-----------
 src/or/or.h                   |    8 +++++
 3 files changed, 71 insertions(+), 20 deletions(-)