commit 7bc9d1e00204c5f11ccf81a9eeca3efaead63cc9 Merge: 44cbd00 e8cc9f3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu May 12 15:33:56 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18977 | 4 ++++ src/common/compat.c | 4 ++++ src/common/util.c | 2 ++ 3 files changed, 10 insertions(+)