Merge branch 'maint-0.2.4' into release-0.2.4
commit790ddd6e0af1be48dc842a28c1599a6027f85b30
authorRoger Dingledine <arma@torproject.org>
Mon, 11 Mar 2013 18:02:26 +0000 (11 14:02 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 11 Mar 2013 18:02:26 +0000 (11 14:02 -0400)
tree8037d2e3ad81c734a57e29a451f067ac9819961c
parentf0a5f91b1388b1319fa76aa329f0d19f441ff117
parentef4db3169344567f30fb72e3e9a66154b976d889
Merge branch 'maint-0.2.4' into release-0.2.4