| commit | e91bb84a91ff019250f19039c26df4f40c1c7544 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 7 Feb 2017 14:57:08 +0000 (7 09:57 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 7 Feb 2017 14:59:12 +0000 (7 09:59 -0500) | ||
| tree | 9755a8ab9f441c274f644557e10c6c783bc8e108 | treesnapshot (tar.gz zip) |
| parent | 7a489a638911012069981702065b952a5809d249 | commitdiff |
| parent | 5446cb8d3d536e9bc737de6d9286bd4b4b185661 | commitdiff |
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch. I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.
This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.
maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch. I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.
This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.