Merge branch 'maint-0.2.6' into maint-0.2.7
commitbe6174f8f6aaaf8f990eb56c5cba16bc5ec0fcea
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 18:01:46 +0000 (11 13:01 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 18:01:46 +0000 (11 13:01 -0500)
tree9d3e447a2ed1447801f15a3bec4d7bdca66d9d30
parentd920cbb82c2203b328d66d6c9d8f28fd35608560
parent740421af194b890c24242a834ed03ffc5c4c16ab
Merge branch 'maint-0.2.6' into maint-0.2.7
src/common/container.c