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

[nickm at torproject.org]

commit 7c2f688fb9b73c2aba6df9bd8792487e8d96cecc
Merge: f68c1b140 6ce8cc5db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:28:49 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid version bump