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

[nickm at torproject.org]

commit 199f13755b5bba85ee39ba9d60387aeef8225844
Merge: 2c9f8badb b440560b8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 15 09:33:41 2017 -0400

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