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

[nickm at torproject.org]

commit cb9a322b675d0aa1178ab92af13b9ec92008c8d4
Merge: b062730a1 f647035b3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 13 16:55:19 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

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