Merge branch 'maint-0.2.4' into release-0.2.4
commitce43072831250eb5e0a089bd2cf092c34701eebf
authorRoger Dingledine <arma@torproject.org>
Sun, 22 Dec 2013 23:31:50 +0000 (22 18:31 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 22 Dec 2013 23:31:50 +0000 (22 18:31 -0500)
tree052e96fb6de96bddec4dbca677b611e3cf051a76
parent9f7be021f3a7a284aa9c68ee453abaf82a1a0cfe
parent59a162f7d2048bc5e6bbc953c2bdc76a0367221b
Merge branch 'maint-0.2.4' into release-0.2.4