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

[nickm at torproject.org]

commit ce289e2cb5099a4abe4468049dc0d262b65bfa17
Merge: f06d9a9 ad95d64
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 11 12:55:40 2016 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

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