commit 13024c79328ac29a037aeb8d6d4d3325068bd167 Merge: 15fddaf 9383fa3 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 15:57:09 2017 -0400

Merge branch 'maint-0.3.1'

src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)