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

[nickm at torproject.org]

commit 469189d84a9b968be7a296c42ac540bf31824124
Merge: eaa8224ce 0729ba286
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 12 09:24:20 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid torgzip.c change, since torgzip has been replaced.