[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #9321 [Tor]: Load balance right when we have higher guard rotation periods
#9321: Load balance right when we have higher guard rotation periods
-------------------------+-------------------------------------------------
Reporter: arma | Owner:
Type: project | Status: needs_review
Priority: major | Milestone: Tor: 0.2.6.x-final
Component: Tor | Version:
Resolution: | Keywords: needs-proposal, tor-auth, tor-
Actual Points: | client, 026-triaged-1, unfrozen, nickm-review
Points: | Parent ID: #11480
-------------------------+-------------------------------------------------
Comment (by asn):
Replying to [comment:45 teor]:
> Apologies for my absence - life has been very chaotic for a few weeks.
>
> Reviewing asn/bug9321_rebase:
> Merging with b101f4e98ce811aee729c31f62ec5dd1cfe44e85 from tor git
> {{{
> CONFLICT (content): Merge conflict in src/or/dirvote.h
> }}}
>
> Resolved conflict by including both #defines:
> {{{#!c
> <<<<<<< HEAD
> /** Lowest consensus method where we include "package" lines*/
> #define MIN_METHOD_FOR_PACKAGE_LINES 19
> =======
> /** Lowest consensus method where authorities may include
> * GuardFraction information in microdescriptors. */
> #define MIN_METHOD_FOR_GUARDFRACTION 19
> >>>>>>> asn/bug9321_rebase
> }}}
>
> Is this the right approach?
> (Running tests now...
Oh more conflicts...
The correct approach here I think is to bump the
`MIN_METHOD_FOR_GUARDFRACTION` to `20`, so that they don't conflict.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/9321#comment:46>
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