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

[nickm at torproject.org]

commit 01a0ab02a3d8ef9e7664945224ce5e22f18ac4b9
Merge: 7c61d10 7f5a440
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 20 14:52:24 2014 -0400

    Merge branch 'bug10116_squashed'

 changes/bug10116       |    3 ++
 src/or/circpathbias.c  |    4 +-
 src/or/circuitlist.c   |  104 +++++++++++++++++++++++++++++-------------------
 src/or/circuitlist.h   |    4 +-
 src/or/circuituse.c    |   46 ++++++++++-----------
 src/or/control.c       |   16 ++++----
 src/or/or.h            |    4 +-
 src/or/relay.c         |    4 +-
 src/or/rendclient.c    |    4 +-
 src/or/rendservice.c   |    8 ++--
 src/or/rephist.c       |    4 +-
 src/or/status.c        |    8 +---
 src/test/test_status.c |   28 ++++++-------
 13 files changed, 125 insertions(+), 112 deletions(-)