[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 mikeperry):
Ok I did the fixup with the type clarifications. It's at
https://github.com/mikeperry-tor/tor/tree/adaptive_padding-
rebased_0.3.6-pr547-squashed still.
It looks like you've been force-pushing to that PR. The head I used
(56376125a42de88bd57240551f7a76f5219fc455) is now gone. and I have
conflicts from my fixup (its extensive due to type renaming -- which is
why I wanted it done before we switched). It looks like
56376125a42de88bd57240551f7a76f5219fc455 is
4bf714c9355254e788db886b0fd7da8cedae0822.
Might not be able to fix the conflicts until tomorrow. In the future, try
not to force push (tho that would not have helped the conflicts.. we just
collided changesets).
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/28142#comment:20>
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