Merge remote-tracking branch 'origin/maint-0.2.6'
commit115dd554c5d0126c1b006f283f6411733b3a70b1
authorNick Mathewson <nickm@torproject.org>
Tue, 26 May 2015 13:41:30 +0000 (26 09:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 26 May 2015 13:41:30 +0000 (26 09:41 -0400)
treeadca43156b01fed9fab0e14f43dc57d536e3e9fc
parentc8024b633eeff6161292666b209b538fda9df4ab
parent08e8c21b1f0acac5e023d05d59f175f2f5716288
Merge remote-tracking branch 'origin/maint-0.2.6'
configure.ac