commit 2cfc4453c246bbd964cb9849bc5959bb1c510ae7 Merge: f4e2c72 d769cab Author: Nick Mathewson nickm@torproject.org Date: Sun Mar 23 00:20:05 2014 -0400

Merge remote-tracking branch 'public/bug9683_rebased'

src/common/container.c | 20 +++++++++++++++ src/common/container.h | 1 + src/or/channel.c | 4 +-- src/or/circuitlist.c | 63 +++++++++++++++++++++++++++++++++++++++++++++--- src/or/circuitmux.c | 11 ++++++++- src/or/circuitmux.h | 3 ++- src/or/relay.c | 10 +++++--- src/or/relay.h | 2 +- 8 files changed, 102 insertions(+), 12 deletions(-)