[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #28142 [Core Tor/Tor]: Merge original WTF-PAD branch
#28142: Merge original WTF-PAD branch
-------------------------------------------------+-------------------------
Reporter: asn | Owner:
| mikeperry
Type: enhancement | Status:
| needs_review
Priority: Medium | Milestone: Tor:
| 0.4.0.x-final
Component: Core Tor/Tor | Version:
Severity: Normal | Resolution:
Keywords: wtf-pad, tor-relay, tor-cell, | Actual Points:
padding |
Parent ID: #28631 | Points:
Reviewer: asn | Sponsor:
| Sponsor2
-------------------------------------------------+-------------------------
Comment (by asn):
OK I took Mike's unittest branch from
[https://github.com/torproject/tor/pull/593 PR#593] and on top of it I
applied my fixups. I pushed two branches: an
[https://github.com/torproject/tor/pull/602 unsquashed one] with all the
fixups intact, and a [https://github.com/torproject/tor/pull/601 squashed
one] which is completely squashed down to the base. The two branches
should have a `git-diff` of zero.
I also replied to all the open review comments by Nick on
[https://github.com/torproject/tor/pull/461 PR#461] by pointing to the
unsquashed branch. So after the fixups get validated, we can start working
on top of the squashed branch which is cleaner.
If everyone likes the fixups and CI blesses the branches, then I think the
next step is to disable/kill the current machine so that the branch can
get merged and we can start working off master for good!
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/28142#comment:25>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs