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

[nickm at torproject.org]

commit 0729ba2868c42bdd34fb305d858cf2d85030e457
Merge: 2b26815e0 bac160b4e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 12 09:23:57 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 src/common/torgzip.c | 2 ++
 1 file changed, 2 insertions(+)