Merge branch 'maint-0.2.4' into release-0.2.4
commit887eba98950f2974bd2031510e1ece2279a4f106
authorRoger Dingledine <arma@torproject.org>
Thu, 11 Apr 2013 05:29:24 +0000 (11 01:29 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 11 Apr 2013 05:29:24 +0000 (11 01:29 -0400)
tree0bda88092333a1aa21925033596f395df4e3d4b1
parentfcd9248387249d68619734a73860ffaab12b021b
parent6acf0ac2851fb95953edea9c231d82f487f28c3d
Merge branch 'maint-0.2.4' into release-0.2.4
configure.ac