Merge branch 'maint-0.2.8' into release-0.2.8
commit945aa9931112c02f5e50594915509b471897684c
authorNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 19:56:45 +0000 (19 15:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 19:56:45 +0000 (19 15:56 -0400)
tree16d473c08783ae88077f4204a2246d9a215f0d8e
parent2b8ba551d3eab2793214ab34a1c9a47a888402cd
parent0d6f293e0e5ca7ae57347d8879a6ba7805a2cac3
Merge branch 'maint-0.2.8' into release-0.2.8