commit 48c1c028ca65c9fbdb83f47e5ccda0469b031bdd Merge: 882e0fb 21f7299 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 23 07:32:18 2016 -0500 Merge branch 'bug18296_squashed' changes/bug18296 | 4 ++++ src/common/container.c | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-)