[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit c894e9d3d44bceaf209a9b73c2c43911af3eb1a8
Merge: f5092e711 6a49e3360
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 11 16:29:10 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

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