Skip to content

Update tor page, fixes #1284#1366

Open
andypiper wants to merge 3 commits into
mainfrom
tor-update
Open

Update tor page, fixes #1284#1366
andypiper wants to merge 3 commits into
mainfrom
tor-update

Conversation

@andypiper

Copy link
Copy Markdown
Contributor

Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
@andypiper andypiper requested review from a team and vmstan December 11, 2023 12:33
@andypiper andypiper self-assigned this Dec 11, 2023
@vercel

vercel Bot commented Dec 11, 2023

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
documentation ✅ Ready (Inspect) Visit Preview 💬 Add feedback Dec 11, 2023 5:40pm

@vmstan

vmstan commented Dec 11, 2023

Copy link
Copy Markdown
Contributor

Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
@andypiper

Copy link
Copy Markdown
Contributor Author

Acknowledging the comments here, and pulled in the updates from the other issues / PRs to avoid another rebase and merge. Thank you @maxolasersquad @Le1b1

@andypiper

Copy link
Copy Markdown
Contributor Author

Ah - I should also add the rest of the updates from #937 for completeness.

@vmstan

vmstan commented Dec 11, 2023

Copy link
Copy Markdown
Contributor

Ah - I should also add the rest of the updates from #937 for completeness.

Agreed

Signed-off-by: Andy Piper <andypiper@users.noreply.github.com>
@vmstan

vmstan commented Dec 11, 2023

Copy link
Copy Markdown
Contributor

LGTM

@andypiper andypiper added the admin Managing a Mastodon instance label Dec 11, 2023
@n0toose

n0toose commented Dec 14, 2023

Copy link
Copy Markdown
Contributor

I fixed the merge conflict from before in my own PR, sorry for the delay - if all of the changes get included in a single commit, I would like to politely ask for attribution using the Co-authored-by: trailer.

Thanks!

@github-actions

Copy link
Copy Markdown

This pull request has merge conflicts that must be resolved before it can be merged.

@mjankowski

Copy link
Copy Markdown
Contributor

I think the initial Tor-related things from linked issues may have been resolved by other recent PRs ... do you want to rebase this and pull in the wording changes, debian stuff, etc (if still relevant) ... or close this and call it good enough based on the others?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

admin Managing a Mastodon instance rebase needed 🚧

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants