Merge branch 'maint-0.2.9' into maint-0.3.0
commit08ed0d79308b308f690b80d65b22be11a97caf09
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Dec 2017 17:15:24 +0000 (20 12:15 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Dec 2017 17:15:24 +0000 (20 12:15 -0500)
treec03a2d5f129b4f03de999d86331514af5902f063
parentd3b7a2bd275842e9826946428d25fc5b72153f7c
parentc604a76a53204eb20af0fab0a9f1f49fba393fd9
Merge branch 'maint-0.2.9' into maint-0.3.0