#24031: Protover.rs could use a better algorithm
-------------------------------------------------+-------------------------
 Reporter:  nickm                                |          Owner:  isis
     Type:  defect                               |         Status:
                                                 |  merge_ready
 Priority:  Very High                            |      Milestone:  Tor:
                                                 |  0.3.3.x-final
Component:  Core Tor/Tor                         |        Version:  Tor:
                                                 |  0.3.3.1-alpha
 Severity:  Normal                               |     Resolution:
 Keywords:  rust, 033-must, protover, security,  |  Actual Points:  5
  033-triage-20180326, 033-included-20180326     |
Parent ID:                                       |         Points:  1
 Reviewer:  nickm                                |        Sponsor:
                                                 |  SponsorM-can
-------------------------------------------------+-------------------------
Changes (by isis):

 * status:  needs_revision => merge_ready


Comment:

 Replying to [comment:27 nickm]:
 > Update: I like the fixups you made last night, and I think I buy your
 argument about the new C protover_all_supported implementation.  There are
 a couple of comments on some of your later commits that you didn't get to
 yet, however -- I'd especially want to know about the testing-mode build
 one on  f6377a4.

 Yep! I just hadn't finished getting to all the comments yet. They should
 be addressed now!

 > Once you're happy with that, our next step is to make a new _r5 branch,
 and get the branch into usable condition.  There are two changes that will
 be needed for that:
 >   * It needs to be based on maint-0.3.3 if we're going to try to merge
 it into 0.3.3; the current version of this branch is baased on master.
 >   * It needs to be squashed.
 >
 > I tried rebasing and squashing it myself, using 'git rebase master
 --onto maint-0.3.3 --autosquash -i', but I ran into conflicts that I'd
 rather not try to resolve myself.
 >

 Okay, I made a `bug24031_r5` branch ([https://travis-
 ci.org/isislovecruft/tor/builds/361296325 CI passes]).

 For the 0.3.4 changes, I made a squashed version of it in my
 `bug24031_r5_squashed` branch ([https://travis-
 ci.org/isislovecruft/tor/builds/361318256 CI passes]).

 For the 0.3.3 changes, I took the squashed 0.3.4 branch above and did the
 rebase command you suggested; that branch is `bug24031_r5_squashed_033`
 ([https://travis-ci.org/isislovecruft/tor/builds/361334966 CI passes]).

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/24031#comment:29>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online
_______________________________________________
tor-bugs mailing list
tor-bugs@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-bugs

Reply via email to