Merge branch 'maint-0.2.4' into release-0.2.4
commit33b86071b765b6254f5aab13fc6dceebe206b103
authorRoger Dingledine <arma@torproject.org>
Sat, 2 Nov 2013 10:35:46 +0000 (2 06:35 -0400)
committerRoger Dingledine <arma@torproject.org>
Sat, 2 Nov 2013 10:35:46 +0000 (2 06:35 -0400)
treed25a67f3fd1aef335015e2ea0cee4cbc0a25ca0b
parent00f95c208e1098ddc575ccb07e167c2548b02b2e
parent5cc155e02a995fda828ff33b105040b2bd96a650
Merge branch 'maint-0.2.4' into release-0.2.4