commit a7f303a4818b551b4a59a3624cc337294a2703e3 Merge: 94c8f36 67e5d49 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 23 14:05:54 2016 -0500 Merge branch 'maint-0.2.7' changes/bug14821 | 4 ++++ src/common/compat.h | 9 +++++++++ 2 files changed, 13 insertions(+)