commit be6174f8f6aaaf8f990eb56c5cba16bc5ec0fcea Merge: d920cbb 740421a Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 11 13:01:46 2016 -0500 Merge branch 'maint-0.2.6' into maint-0.2.7 changes/bug18162 | 7 +++++++ src/common/container.c | 37 ++++++++++++++++++++----------------- 2 files changed, 27 insertions(+), 17 deletions(-)