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

[nickm at torproject.org]

commit fa2bd196b40504e0fd20c58574d6911aef19a68e
Merge: a9a76aa fecc66d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 20 13:54:35 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/new_requirement_pkgconfig | 5 +++++
 1 file changed, 5 insertions(+)