search

torproject / stem

Python controller library for Tor
https://stem.torproject.org/
GNU Lesser General Public License v3.0
257 stars 75 forks source link

Commits from fork have been pulled in along with PR #144

Closed PascalinDe closed 8 months ago

PascalinDe commented 8 months ago

Hey, not sure how this happened but merging https://github.com/torproject/stem/pull/135 yesterday seems to have pulled in some commits on our fork as well:

oddly enough two of these are commits that I created after updating the PR.

The commit history of that branch does not contain the commits either:

Screenshot 2023-10-12 at 10-00-34 Commits · c4dt_stem

PascalinDe commented 8 months ago

added PR #145 to remedy this

atagar commented 8 months ago

Oops, thanks Carine. My bad. When I merged your recent work all the commits looked decent to me so I pulled everything in. Merged the revert.

PascalinDe commented 8 months ago

OK, thanks

I'll probably open one or the other PR with them as well, it's just that they haven't all been properly tested yet