Re: [tor-bugs] #28142 [Core Tor/Tor]: Merge original WTF-PAD branch

["Tor Bug Tracker & Wiki" <blackhole@xxxxxxxxxxxxxx>]

#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):

 Replying to [comment:20 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).

 Oof sorry about this. I had to rebase to master because some of the
 probability distribution work was using stuff from master (#28193), but I
 shouldn't have force pushed into the useful PR. Please let me know if
 there is anything I can do to help you with declogging the conflict
 resolution.

 FWIW, I started doing fixups from PR461. Some of them are quite heavy
 (e.g. https://github.com/torproject/tor/pull/461#discussion_r231893260) so
 I'm gonna wait until you address the conflicts and finish up the branch
 before doing those, to avoid more conflict hell. Then I will start
 applying the fixups, and you can start doing the tests, and after that I
 will take care of the conflict resolution between our two branches.

 BTW, there are a few non-fixup related questions in PR461 that I would
 like help with. I will resolve the fixup stuff in PR461 soon, and only
 leave the questions hanging, so that you can roll through them.

 cheers!

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/28142#comment:21>
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