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

[nickm at torproject.org]

commit f647035b3783eb14c79cea949b36efa97861fbc2
Merge: 17a923941 f0ed7895c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 13 16:55:18 2018 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.1

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