Merge branch 'maint-0.2.7' into maint-0.2.8
commit4f4d77c435d74bdb6359e86ff60c4a4c0d7e45b8
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:52:18 +0000 (5 13:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:52:18 +0000 (5 13:52 -0400)
tree712b419f509bb17ad5b5e16519a89b2634a18a77
parent8f44d2822ed67fe64d86692a6f045e57ee3a7146
parent7c25b41c8cfffebddbc7ba4d66aa345642eebc1f
Merge branch 'maint-0.2.7' into maint-0.2.8