| commit | 7d3d56e59a3df16615881007a77b77e30fecb831 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 20 Dec 2016 23:19:41 +0000 (20 18:19 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 20 Dec 2016 23:19:41 +0000 (20 18:19 -0500) | ||
| tree | 0fd918e7660790b133352985366bce71b007cb20 | treesnapshot (tar.gz zip) |
| parent | db58d4d16ff156b8827198b2732646c73eb59f14 | commitdiff |
| parent | 8f857c23b755cda41dbb8adf6b14d5defb76a00c | commitdiff |
Merge branch 'maint-0.2.4' into maint-0.2.5
(ours merge -- there is a separate 0.2.5 patch for 20384.)
(ours merge -- there is a separate 0.2.5 patch for 20384.)