Merge branch 'maint-0.2.8' into release-0.2.8
commit1992ed67563f110c2fe87a97e5a03d1a442bdfa5
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:05:42 +0000 (5 13:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:05:42 +0000 (5 13:05 -0400)
tree560259ac4a13800683158047e08b9bd77457065e
parentc174f060fa252c816461552bb0de2bf758dcd61f
parent8f44d2822ed67fe64d86692a6f045e57ee3a7146
Merge branch 'maint-0.2.8' into release-0.2.8