Merge branch 'bug18977_026_v2' into maint-0.2.7
commit4165b1a0da893a9f67a2ba32b4fcd54a7804ce14
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 19:33:35 +0000 (12 15:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 19:33:35 +0000 (12 15:33 -0400)
treeedbb59f93ec3278d095cd57d6febfb164cd512ef
parentd40e8695f42959d180fe563d447422327535c753
parent20b01cece8cd2ceb7f8051aee04294bdba471f1a
Merge branch 'bug18977_026_v2' into maint-0.2.7
src/common/compat.c
src/common/util.c