Merge branch 'maint-0.2.7' into release-0.2.8
commit7e47709faa3fa29b0df6e268b38a33ef583c04cf
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:52:23 +0000 (5 13:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:52:23 +0000 (5 13:52 -0400)
tree3d4bd049acd72eb424a5dd2fc6bfab61866aefb8
parent1992ed67563f110c2fe87a97e5a03d1a442bdfa5
parent7c25b41c8cfffebddbc7ba4d66aa345642eebc1f
Merge branch 'maint-0.2.7' into release-0.2.8