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

[nickm at torproject.org]

commit 7fcae5bffa336e089b6b0dd9e30504f08f9f3976
Merge: 3bb6028a8 346066a42
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 19 13:08:59 2017 -0400

    Merge branch 'maint-0.3.1'

 .gitignore | 1 +
 1 file changed, 1 insertion(+)