diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-11-09 17:13:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-11-09 17:13:41 -0500 |
| commit | 494ced690d4db09b5660472df490f9c8512c2684 (patch) | |
| tree | a9c60480362ed32cb0ec20c750e9ed547c0595a6 /changes/ticket33679 | |
| parent | 210a94b23159176524e2e94931a236c84981bf7d (diff) | |
| parent | 3d3dc08ed8782e88f1e87a9550b9f18751c5732a (diff) | |
| download | tor-494ced690d4db09b5660472df490f9c8512c2684.tar.gz tor-494ced690d4db09b5660472df490f9c8512c2684.zip | |
Merge branch 'maint-0.4.3' into maint-0.4.4
"-s ours" to avoid version bump.
Diffstat (limited to 'changes/ticket33679')
0 files changed, 0 insertions, 0 deletions