diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:20:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:20:13 -0500 |
| commit | 0a43134009a431ecd734a4c122d5de0d63529800 (patch) | |
| tree | 06b41270631e38e894fee7a8fb98da69317fca7f | |
| parent | 115cefdeeefd99f435948bfe42b1ce842019edfb (diff) | |
| parent | c6f2ae514eb2713d386bedac2f7e71ed04385026 (diff) | |
| download | tor-0a43134009a431ecd734a4c122d5de0d63529800.tar.gz tor-0a43134009a431ecd734a4c122d5de0d63529800.zip | |
Merge branch 'maint-0.2.6' into maint-0.2.7
This is an "ours" merge to avoid conflicts on the authority list:
the 0.2.7 branch already has the tonga->bifroest merge.
0 files changed, 0 insertions, 0 deletions