commit 9959bc54e1210644af83ef5dde6c66e2641661ed Merge: 2ee56e4 8d9602c Author: Roger Dingledine arma@torproject.org Date: Sat May 17 04:36:17 2014 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

This is an "ours" merge, to avoid taking the commit that bumped maint-0.2.4's version to 0.2.4.22-dev.