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

[nickm at torproject.org]

commit 0834f4d93dc808bc2f01350635719551762fee69
Merge: 4c015d9fe ca8e9813b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 13 12:07:46 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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