commit 469189d84a9b968be7a296c42ac540bf31824124 parent eaa8224cef25c1fb27b5f2ef14f836325439f10e Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 12 Sep 2017 09:24:20 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid torgzip.c change, since torgzip has been replaced.