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

[nickm at torproject.org]

commit c57a119eb886d705bc2a067635ca7ef8bc74f1de
Merge: 6b2c886 75c6fdd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 28 13:54:00 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1
    
    "ours" merge to avoid taking redundant ws fix