commit 85c539009a91385058bafe286d89f214014da719 Author: Roger Dingledine arma@torproject.org Date: Thu Feb 9 03:57:04 2012 -0500

Revert "add a "docs" to the manual URI as listed in torrc.sample.in"

This reverts commit 55e8cae81553678ec77ce6b8fb1bf2d5e483e0aa.

The conversation from irc: > weasel: i had intended to leave torrc.sample.in alone in maint-0.2.2, since i don't want to make all your stable users have to deal with a torrc change. but nickm changed it. is it in fact the case that a change in that file means a change in the deb? <weasel> it means you'll prompt every single user who ever touched their torrc <weasel> and they will be asked if they like your new version better than what they have right now <weasel> so it's not great

Instead I changed the website to redirect requests for the tor-manual URL listed in maint-0.2.2's torrc.sample.in so the link will still work. --- changes/manual_uri_in_torrc | 3 --- src/config/torrc.sample.in | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/changes/manual_uri_in_torrc b/changes/manual_uri_in_torrc deleted file mode 100644 index 30b12ec..0000000 --- a/changes/manual_uri_in_torrc +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (documentation): - - Fix the URL for the online version of the manual that's listed in - torrc.sample. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 6455cbe..f0c78ce 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -6,7 +6,7 @@ ## that begin with just "#" are disabled commands: you can enable them ## by removing the "#" symbol. ## -## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, +## See 'man tor', or https://www.torproject.org/tor-manual.html, ## for more options you can use in this file. ## ## Tor will look for this file in various places based on your platform: