| commit | 5d41e2223f64517300aad168b2f2479ba00ac10b | |
| author | teor <teor@torproject.org> | |
| Wed, 13 Mar 2019 20:59:09 +0000 (14 06:59 +1000) | ||
| committer | teor <teor@torproject.org> | |
| Wed, 13 Mar 2019 20:59:09 +0000 (14 06:59 +1000) | ||
| tree | 6d6699222ab6ad8c84907050ddfd44acd360d159 | treesnapshot (tar.gz zip) |
| parent | ffd7207025d363b3bb19c3d50a67ed760da03ccb | commitdiff |
| parent | e021f89f3636d197058dddea4383632bdf466ff0 | commitdiff |
Merge branch 'maint-0.3.4' into maint-0.3.5
"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.
"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.