f77f9bd and 40a87c4 re-commited into master after #4662
Nick, it seems like you reverted commits
40a87c4 in your
revert_4312 branch (#4662 (moved)).
After a discussion in #tor-dev, people decided that these commits were reverted by accident, since they are irrelevant to #4312 (moved). 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.