Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux
commit01a00d0f94e7d8f89cc5244c8b49bf27bc37f797
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Feb 2017 15:27:29 +0000 (28 10:27 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Feb 2017 15:27:29 +0000 (28 10:27 -0500)
treed93e790aaff40826bca95073cd7ac220d17054c5
parent1fe5097132704f35761110bbf55fd77cdb0669b2
parentb5526bef384524badbd1411ad9570e6373438b06
Merge branch 'maint-0.2.7-redux' into release-0.2.7-redux