[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug17026'

[nickm at torproject.org]

commit 3b09322c9b388f68b26b891114affa869e84376c
Merge: 46f2682 46e2276
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 2 13:15:36 2015 +0200

    Merge remote-tracking branch 'sebastian/bug17026'

 changes/bug17026       |    5 +++++
 src/common/container.c |   23 ++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)