Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve Tor documentation #937

Merged
merged 4 commits into from
Dec 15, 2023
Merged

Improve Tor documentation #937

merged 4 commits into from
Dec 15, 2023

Conversation

n0toose
Copy link
Contributor

@n0toose n0toose commented Apr 29, 2022

No description provided.

@n0toose
Copy link
Contributor Author

n0toose commented Apr 30, 2022

TO-DO: Note how redirects also work when using an HTTPS certificate.

helix2301
helix2301 approved these changes Nov 8, 2022
View reviewed changes
Copy link

@helix2301 helix2301 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just cleaning up the Tor documentation rewording things and fixing typos

@github-actions GitHub Actions
Copy link

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

@vmstan
Copy link
Sponsor Contributor

vmstan commented Dec 5, 2023

@n0toose there are some good changes here, are you able to rebase so we can review?

@vercel Vercel
Copy link

vercel bot commented Dec 6, 2023

@n0toose is attempting to deploy a commit to the Mastodon Team on Vercel.

A member of the Team first needs to authorize it.

@n0toose
Copy link
Contributor Author

n0toose commented Dec 6, 2023 •
edited
Loading

there are some good changes here, are you able to rebase so we can review?

Thanks for getting back to me. Just so you know: Your attentiveness and efforts with making this project more community-friendly have not gone unnoticed, thanks!

I tried rebasing. Keep in mind: It's been a while. I am not able to test the instructions or 100% back up the veracity of its contents, but, if I remember correctly, my changes were more... philosophical, rather than technical.

@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 6, 2023

This pull request has resolved merge conflicts and is ready for review.

vmstan
vmstan suggested changes Dec 6, 2023
View reviewed changes
content/en/admin/optional/tor.md Outdated Show resolved Hide resolved
@github-actions GitHub Actions
Copy link

github-actions bot commented Dec 7, 2023

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

vmstan
vmstan reviewed Dec 11, 2023
View reviewed changes
Copy link
Sponsor Contributor

@vmstan vmstan left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ignore this.

@vmstan vmstan mentioned this pull request Dec 11, 2023
Open
andypiper added a commit that referenced this pull request Dec 11, 2023
@andypiper
Incorporate #937
929f3b8 
Signed-off-by: Andy Piper <[email protected]>
@github-actions GitHub Actions
Copy link

This pull request has resolved merge conflicts and is ready for review.

@andypiper andypiper merged commit 63edbba into mastodon:master Dec 15, 2023
1 check failed
@n0toose n0toose deleted the tor-improvements branch December 16, 2023 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vmstan vmstan vmstan requested changes

@andypiper andypiper andypiper approved these changes

@helix2301 helix2301 helix2301 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@n0toose @vmstan @andypiper @helix2301