Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4
commitda8505205dab91f36a5d3f67ca9b4e0904d44b0a
authorNick Mathewson <nickm@torproject.org>
Mon, 6 Apr 2015 13:31:30 +0000 (6 09:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 6 Apr 2015 13:31:30 +0000 (6 09:31 -0400)
tree1b44b460b4897f18f3378711de6d708a74da1389
parent44b48a9b67f2b4900bed872158dd480f38c27c08
parent7451b4cafededa95da0099ea2444224d941eef52
Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.4