Merge branch 'maint-0.2.9' into maint-0.3.0
commit5348c8996f53964ce7466f00acad33f625191983
authorNick Mathewson <nickm@torproject.org>
Sat, 11 Nov 2017 17:23:33 +0000 (11 12:23 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 11 Nov 2017 17:23:33 +0000 (11 12:23 -0500)
tree18d73b82636bd1a551bb75f08fbee24b891d56dd
parentf2e23d38ab109ea8d5be0d6b9e9edad4528ff68a
parent9666c620d584b2c715596b415a808941b17cbda0
Merge branch 'maint-0.2.9' into maint-0.3.0