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 (6 matches)

Ticket Summary Milestone Owner Reviewer Priority Severity Modified
#30871 circuit_mark_for_close_(): Bug: Duplicate call to circuit_mark_for_close at ../src/feature/hs/hs_service.c:3166 (first at ../src/feature/hs/hs_service.c:2385) Tor: 0.4.0.x-final dgoulet asn Medium Normal 2 weeks ago
#30649 Every few hours, relays [warn] Received circuit padding stop command for unknown machine. Tor: 0.4.0.x-final mikeperry asn Medium Normal 2 weeks ago
#30894 Memory leak on invalid CSV_INTERVAL value Tor: 0.4.0.x-final nickm dgoulet Medium Normal 2 weeks ago
#31001 Undefined behavior in tor_vasprintf() Tor: 0.4.0.x-final nickm catalyst Medium Normal 6 days ago
#31003 heap-use-after-free src/feature/nodelist/routerlist.c:704 in router_get_by_descriptor_digest Tor: 0.4.0.x-final nickm dgoulet High Normal 2 weeks ago
#31463 Redundant build exclusion not working corrently on travis Tor: 0.4.0.x-final teor Medium Normal 5 hours ago

Milestone: Tor: 0.4.1.x-final (1 match)

Ticket Summary Milestone Owner Reviewer Priority Severity Modified
#31089 Consider using data-URI to embed how_tor_works_thumb.png image into tor-exit-notice.html Tor: 0.4.1.x-final teor Low Trivial 6 days ago

Milestone: Tor: 0.4.2.x-final (3 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 6 days ago
#30935 Move variable definition code out of confparse.c, and refactor Tor: 0.4.2.x-final nickm teor Medium Normal 5 hours ago
#29879 Make git-push-all.sh push branches in a specific order Tor: 0.4.2.x-final teor asn Medium Normal 5 hours 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 4 months ago Last modified on Apr 17, 2019, 2:21:57 AM