Merge branch 'maint-0.2.4' into release-0.2.4
commit7d5ddde4872d87cdc28f203ede8ff4038efa9886
authorNick Mathewson <nickm@torproject.org>
Mon, 6 Apr 2015 13:49:06 +0000 (6 09:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 6 Apr 2015 13:49:06 +0000 (6 09:49 -0400)
tree707153142b87774b469543072e78ccfefc994f17
parentda8505205dab91f36a5d3f67ca9b4e0904d44b0a
parent542100d3cac59dc178cb01ca639544c0f335abd3
Merge branch 'maint-0.2.4' into release-0.2.4