org/teams/NetworkTeam/MainlineMerges.md

+= 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.
+
+[[TicketQuery(status=merge_ready,component=Core Tor/Tor,keywords!~=tor-spec|torspec,milestone=!Tor: 0.3.5.x-final|!Tor: 0.3.4.x-final|!Tor: 0.2.9.x-final,group=milestone,format=table,order=owner|reviewer|changetime,col=id|summary|milestone|owner|reviewer|priority|severity|changetime|sponsor,max=100)]]
+
+=== 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.)
+
+[[TicketQuery(status=merge_ready,component=Core Tor/Tor,keywords~=tor-spec|torspec,format=table,order=changetime,col=id|summary|owner|reviewer|priority|severity|changetime|sponsor,max=100)]]
+