commit effeb36968ff565ac70929b5ace12c4ef52f4590 Merge: e083a62 286fa94 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 8 18:45:05 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20560 | 4 ++++ src/common/compat.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-)