commit 31f41fe09613398dc818ae30251724779f1f53c8 Merge: 053cf55 286fa94 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 8 18:45:10 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20560 | 4 ++++ src/common/compat.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)