wiki:org/teams/NetworkTeam/MainlineMerges

Mainline Merges

Tor Mainline

The mainline releases are currently master and 0.4.0.

We try to merge tor tickets every working day.

These tickets are:

  • merge_ready,
  • not in a backport milestone (0.3.5, 0.3.4, or 0.2.9),
  • not tor-spec (or torspec).

You should not merge code that you wrote or reviewed. Your name will appear in bold in the table.

Milestone: Tor: 0.4.0.x-final (3 matches)

Ticket Summary Milestone Owner Reviewer Priority Severity Modified
#31001 Undefined behavior in tor_vasprintf() Tor: 0.4.0.x-final nickm catalyst Medium Normal 6 weeks ago
#23818 Make v2 and v3 single onion services retry all failed intro and rend connections with a 3-hop path Tor: 0.4.0.x-final teor asn Medium Normal 5 weeks ago
#12399 "Hash of session info was not as expected" should be log_protocol_warn Tor: 0.4.0.x-final mikeperry, dgoulet Medium Normal 6 weeks ago

Milestone: Tor: 0.4.1.x-final (17 matches)

Ticket Summary Milestone Owner Reviewer Priority Severity Modified
#30344 conn_read_callback is called on connections that are marked for closed Tor: 0.4.1.x-final asn dgoulet Medium Normal 5 days ago
#31408 torrc : ClientOnionAuthDir after include directives breaks client to v2 services Tor: 0.4.1.x-final asn Very High Normal 3 weeks ago
#31548 hs-v3: Service can pick more than HiddenServiceNumIntroductionPoints intro points Tor: 0.4.1.x-final dgoulet asn Medium Normal 11 hours ago
#30916 assert in dimap_add_entry() Tor: 0.4.1.x-final nickm teor Medium Normal 13 days ago
#31107 channel: channel_tls_handle_cell() CELL_VERSIONS code reached Tor: 0.4.1.x-final nickm teor High Normal 13 days ago
#31372 Appveyor and Travis should use "make -k" Tor: 0.4.1.x-final nickm teor Medium Normal 12 days ago
#31466 Consider demoting ".exit is disabled" log message to info Tor: 0.4.1.x-final nickm asn Medium Normal 12 days ago
#31549 Authorities should stop listing relays running pre-0.2.9, or running 0.3.0 through 0.3.4 Tor: 0.4.1.x-final nickm dgoulet, teor Medium Normal 5 days ago
#31898 Occasional crash during shutdown when using Tor API Tor: 0.4.1.x-final nickm teor Medium Normal 12 days ago
#31571 Add the tor version and a newline to raw_assert() Tor: 0.4.1.x-final teor nickm Medium Normal 5 weeks ago
#31594 Close all the log fds before aborting Tor: 0.4.1.x-final teor nickm Medium Normal 5 weeks ago
#31614 Implement clean_up_backtrace_handler() Tor: 0.4.1.x-final teor nickm Medium Normal 2 weeks ago
#31615 Reorder the early subsystems based on their dependencies Tor: 0.4.1.x-final teor nickm Medium Normal 5 weeks ago
#31736 Stop using mutex_destroy(), when multiple threads can still access the mutex Tor: 0.4.1.x-final teor nickm Medium Normal 2 weeks ago
#31884 Define ExecuteBash in the Appveyor error block Tor: 0.4.1.x-final teor asn Medium Normal 11 days ago
#31897 util/map_anon_nofork test fails on SunOS Tor: 0.4.1.x-final teor ahf High Normal 11 days ago
#31939 log spam: Bug: buffers_tls.c:73: buf_read_from_tls: Non-fatal assertion !(buf->datalen >= INT_MAX - at_most) failed. Tor: 0.4.1.x-final teor catalyst Medium Normal 10 hours ago

Milestone: Tor: 0.4.2.x-final (2 matches)

Ticket Summary Milestone Owner Reviewer Priority Severity Modified
#26294 attacker can force intro point rotation by ddos Tor: 0.4.2.x-final asn dgoulet Medium Normal 5 days ago
#30860 Add a chutney job that runs on macOS, so that IPv6 chutney tests work Tor: 0.4.2.x-final teor nickm Medium Normal 7 hours ago

Milestone: Tor: 0.4.3.x-final (2 matches)

Ticket Summary Milestone Owner Reviewer Priority Severity Modified
#31111 Properly support two padding machines per circuit Tor: 0.4.3.x-final mikeperry Medium Normal 5 weeks ago
#31684 Add control port GETINFO support for dumping the local consensus Tor: 0.4.3.x-final asn Medium Normal 3 days ago

Tor Spec Master

These merge_ready tickets are tagged tor-spec or torspec, and anyone can merge them under our 2-person rule: (We require separate authors and reviewers for torspec, but the merger can be anyone.)

Ticket Summary Owner Reviewer Priority Severity Modified
No tickets found

Last modified 6 months ago Last modified on Apr 17, 2019, 2:21:57 AM