Opened 8 years ago

Closed 8 years ago

Last modified 7 years ago

#4672 closed defect (fixed)

f77f9bd and 40a87c4 re-commited into master after #4662

Reported by: asn Owned by:
Priority: Medium Milestone:
Component: Core Tor/Tor Version:
Severity: Keywords: tor-relay
Cc: nickm Actual Points:
Parent ID: #4662 Points:
Reviewer: Sponsor:

Description

Nick, it seems like you reverted commits f77f9bd and 40a87c4 in your revert_4312 branch (#4662).

After a discussion in #tor-dev, people decided that these commits were reverted by accident, since they are irrelevant to #4312. So, these two commits were re-commited into master, since Roger wanted to tag a new -alpha.

This ticket is to make sure that you see this, and notify us in case we screwed up.

Child Tickets

Change History (5)

comment:1 Changed 8 years ago by Sebastian

Status: newneeds_review

See also the last comment on #4662. See branch bug4672 with the proposed (not yet actually merged) changes to re-apply those two commits, and also re-apply a part of the 7920ea55b8d9 commit that got reverted as well.

comment:2 Changed 8 years ago by arma

I just merged it, so I can put out the alpha.

Leaving open so nickm can close it (or not).

comment:3 Changed 8 years ago by nickm

Resolution: fixed
Status: needs_reviewclosed

Yup; this was a nickm error

comment:4 Changed 7 years ago by nickm

Keywords: tor-relay added

comment:5 Changed 7 years ago by nickm

Component: Tor RelayTor
Note: See TracTickets for help on using tickets.