Merge branch 'maint-0.2.4' into release-0.2.4
commit2349833f71941e96a1bbdcf22c4645cef4ac3ced
authorRoger Dingledine <arma@torproject.org>
Sun, 22 Dec 2013 07:25:53 +0000 (22 02:25 -0500)
committerRoger Dingledine <arma@torproject.org>
Sun, 22 Dec 2013 07:25:53 +0000 (22 02:25 -0500)
tree897e809ea8828bc6762031e1a2e9afd312c3d846
parente719d05fd296a9dd59af9becb21ef3ff1c426b3c
parent2c956f0c99beed22ada43ba9458302308af87884
Merge branch 'maint-0.2.4' into release-0.2.4