Sync with sagernet/tailscale:dev (Fix tailscale route, batched InputPackets)#1
Merged
hiddify-com merged 1 commit intoJul 16, 2026
Conversation
Syncs this branch to sagernet/tailscale:dev's current HEAD (7d3e867), the exact commit hiddify-sing-box's go.mod pins.
hiddifydeveloper
added a commit
to hiddifydeveloper/hiddify-sing-box
that referenced
this pull request
Jul 15, 2026
Points replace/tailscale at the sync-with-sagernet-dev branch (hiddify/tailscale#1), which merges the fork up to the exact sagernet/tailscale:dev commit go.mod pins. Was 18 commits behind before this.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Updates this branch to
sagernet/tailscale:dev's current HEAD (7d3e867, "Fix tailscale route") — the exact commithiddify-sing-box'sgo.modpins asv1.92.4-sing-box-1.13-mod.7.0.20260711004045-7d3e867147ad.This branch was only 2 commits behind (
7d3e86714 Fix tailscale route,ae2dde129 Add batched InputPackets) and 2 ahead (the merge commit + hiddify'swgengine/magicsock.Conn.SendWithoutModifyaddition from #). Clean merge, no conflicts.Test plan
go build ./wgengine/magicsock/... ./net/...clean in this modulehiddify-sing-boxbuild (with the full default tag set, includingwith_tailscale) succeeds against this branch via thereplacedirectivego vet ./protocol/tailscale/...clean on the sing-box sideNote:
go build ./...on this module has pre-existing failures infeature/debugportmapper,tsnet/example/tsnet-http-client, andtsconsensus— confirmed these also fail on pristinesagernet/tailscale:dev(unrelated to this merge, and none of these packages are imported bysing-box).