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

[nickm at torproject.org]

commit 370a2b9fd18946f292045bd96c5b3381d32f4877
Merge: e72734959 9c294d29e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 12:08:53 2017 -0400

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