commit e712b5d784db912f7924f090b918888125aa6bcf Merge: 24b7b92 becc957 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 31 16:33:03 2016 -0400 Merge branch 'bug19968_029' into maint-0.2.9 changes/bug19968 | 11 +++++++++++ src/common/compat.c | 1 + 2 files changed, 12 insertions(+)