[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
Re: [tor-bugs] #4994 [Tor Client]: Be willing to use microdescs even if one bridge runs 0.2.2
#4994: Be willing to use microdescs even if one bridge runs 0.2.2
------------------------------+---------------------------------------------
Reporter: arma | Owner:
Type: enhancement | Status: needs_review
Priority: normal | Milestone: Tor: 0.2.4.x-final
Component: Tor Client | Version:
Keywords: microdescriptors | Parent:
Points: | Actualpoints:
------------------------------+---------------------------------------------
Changes (by arma):
* status: needs_revision => needs_review
Comment:
git, you're my hero:
{{{
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: use microdescriptors if *any* of our bridges can handle them
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging src/or/microdesc.c
Auto-merging src/or/directory.c
Auto-merging src/or/circuitbuild.h
Auto-merging src/or/circuitbuild.c
Applying: generalize choose_random_entry()'s dirinfo parameter
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging src/or/directory.c
Auto-merging src/or/circuitbuild.h
Auto-merging src/or/circuitbuild.c
}}}
I added a changes file, tested it, and pushed it to my feature4994 branch.
--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/4994#comment:2>
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