[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit 68a27dad4368b661f5b05d7660f6a96d03c7ea48
Merge: 1d76d38 e712b5d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 31 16:33:12 2016 -0400

    Merge branch 'maint-0.2.9'

 changes/bug19968    | 11 +++++++++++
 src/common/compat.c |  1 +
 2 files changed, 12 insertions(+)