Merge branch 'maint-0.2.6' into maint-0.2.7
commiteeb9751eadd148e5077cedb28f75e756b47281c0
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Dec 2015 14:43:42 +0000 (8 09:43 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Dec 2015 14:43:42 +0000 (8 09:43 -0500)
treee427ef759e431c424828923afaa4c78826813151
parente9bf584694a592852293b945575d17ea4c3b742b
parentb53ff8606714c2f94d251a40c1a073bca760495e
Merge branch 'maint-0.2.6' into maint-0.2.7