Merge branch 'maint-0.2.8' into maint-0.2.9
commitc604a76a53204eb20af0fab0a9f1f49fba393fd9
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Dec 2017 17:15:23 +0000 (20 12:15 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Dec 2017 17:15:23 +0000 (20 12:15 -0500)
tree20c5a38a39b5922c740541226e60eba766df4a6e
parenteecfed0cd2c8c92175106e211d1662fa43fc60bc
parent877dd1d6c8038cdef48a12a128eb08ae02ac628b
Merge branch 'maint-0.2.8' into maint-0.2.9