Merge branch 'maint-0.2.7' into maint-0.2.8
commit50249c7cd97c982fe829a9e7a22e660658b4e217
authorNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:23:20 +0000 (11 12:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:23:20 +0000 (11 12:23 -0400)
tree736b4454e3476486c5d6987c5c8812a92ab08184
parent5cd59791328c1a0e6987d83b9b55aeccbbf6eaf4
parent039fc8427a512efce87b7bd21c10c4adca4ba30d
Merge branch 'maint-0.2.7' into maint-0.2.8
configure.ac