[tor-commits] [tor/release-0.2.5] Merge branch 'bug18162_024' into maint-0.2.4

[nickm at torproject.org]

commit ad95d64fece2c6d2eddffc8fa5178c3ffccc0cd7
Merge: d5ac79e c2fd648
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 11 12:55:25 2016 -0500

    Merge branch 'bug18162_024' into maint-0.2.4

 changes/bug18162       |  7 +++++++
 src/common/container.c | 29 +++++++++++++++++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)