Merge branch 'maint-0.2.4' into release-0.2.4
commit4ef52cc16759eb75523b9694d75d051c01ba994c
authorRoger Dingledine <arma@torproject.org>
Tue, 25 Feb 2014 20:05:06 +0000 (25 15:05 -0500)
committerRoger Dingledine <arma@torproject.org>
Tue, 25 Feb 2014 20:05:06 +0000 (25 15:05 -0500)
tree62edc6c3274f0e2a14f278cdeb8f7252eb246f03
parent4428a14616c1a97430f9dab5419f2426f97c8883
parentd7950eda2bfd927a18df4a2620952d10dda1705c
Merge branch 'maint-0.2.4' into release-0.2.4
configure.ac