Merge branch 'maint-0.2.7' into maint-0.2.8
commite8cc9f3edf21ff56ba16cf716e74eb1efba0b0f1
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 19:33:47 +0000 (12 15:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 19:33:47 +0000 (12 15:33 -0400)
tree542f6c5e4efe8c4e4c2ff9cb1dab099d18e9791f
parentce6f2d1c4da5125cdd4a69fcc4cd45f7c3d6ca8d
parent4165b1a0da893a9f67a2ba32b4fcd54a7804ce14
Merge branch 'maint-0.2.7' into maint-0.2.8
src/common/compat.c
src/common/util.c