commit c8e6b2e4bf2b98ac227ddbfc8796e401bba0b674 Merge: d9663a2 9383fa3 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 5 15:57:09 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)