[tor-commits] [tor/master] Merge branch 'teor-bug22797-025' into maint-0.3.1

[nickm at torproject.org]

commit e88aa98451e5fe28b2840cf218dba67e4596aa56
Merge: d011126 878e0d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 11:16:30 2017 -0400

    Merge branch 'teor-bug22797-025' into maint-0.3.1

 changes/bug22797    |  4 ++++
 src/common/compat.c | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)