| commit | 39bb283fca95648aeb58d9e8927de6e1530c6015 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Thu, 5 Dec 2019 18:32:40 +0000 (5 13:32 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Thu, 5 Dec 2019 18:32:40 +0000 (5 13:32 -0500) | ||
| tree | cc2bbc64ebbfe98ab4dc75e3e295969781e2026e | treesnapshot (tar.gz zip) |
| parent | 37d1ee554da5db5a4e13ecdac3cc91e07656f27d | commitdiff |
| parent | 0a33522b6268ca8936df37dab4ed622e0ff5507b | commitdiff |
Merge branch 'maint-0.4.2'
"ours" to avoid version bump.
"ours" to avoid version bump.