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

[nickm at torproject.org]

commit 4bfbce9de7ac84259e8c27939cace2952e98d0e6
Merge: 6a35e7d69 cb9a322b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 13 16:55:19 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug21074_downgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)