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

[nickm at torproject.org]

commit dd9f255e5b525f6801e149fb5da510e58baccf9e
Merge: 2341368 c1c938e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 10:12:47 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22502_part1 | 12 ++++++++++++
 1 file changed, 12 insertions(+)