Merge branch 'maint-0.2.4' into maint-0.2.5
commitce289e2cb5099a4abe4468049dc0d262b65bfa17
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 17:55:40 +0000 (11 12:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 17:55:40 +0000 (11 12:55 -0500)
tree5d7307451562bb7d5a0bc683698e9a06578f37cd
parentf06d9a9cef036fc4da995f3ffda8e7a7770d0b74
parentad95d64fece2c6d2eddffc8fa5178c3ffccc0cd7
Merge branch 'maint-0.2.4' into maint-0.2.5
src/common/container.c