Merge branch 'maint-0.2.4' into release-0.2.4
commit911e0a71a609864e1a10f6cc0ca5f16661f15ece
authorRoger Dingledine <arma@torproject.org>
Mon, 10 Feb 2014 21:41:13 +0000 (10 16:41 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 10 Feb 2014 21:41:13 +0000 (10 16:41 -0500)
treef5fd1c366677b110281cc57de9ab34b54c9a45bf
parentd9c111d954c6b3b7cd4704b4bec8d830ffa056f6
parent7f6aa780e3183f34b2fa771e17813018e6b28115
Merge branch 'maint-0.2.4' into release-0.2.4