April 2013 - tor-commits - lists.torproject.org

[flashproxy/master] Move the bundle torrc appendixes into separate files.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit 84cc9046e7c7765f307ddb4fce87288ff40e3a61 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 16:09:33 2013 -0700 Move the bundle torrc appendixes into separate files. --- doc/bundle-gnulinux.txt | 30 +++--------------------------- doc/bundle-macosx.txt | 30 +++--------------------------- doc/bundle-torrc-gnulinux | 26 ++++++++++++++++++++++++++ doc/bundle-torrc-macosx | 26 ++++++++++++++++++++++++++ doc/bundle-torrc-windows | 26 ++++++++++++++++++++++++++ doc/bundle-windows.txt | 30 +++--------------------------- 6 files changed, 87 insertions(+), 81 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index ca1f42e..5440e2c 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -121,33 +121,9 @@ Copy files into the bundle. $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy $ find App -name '*.pyc' | xargs rm -f -Make the second half of Data/Tor/torrc look like this. - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60 -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed +Append bundle-torrc-gnulinux to the end of Data/Tor/torrc. + + $ cat ~/flashproxy/doc/bundle-torrc-gnulinux >> Data/Tor/torrc Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. diff --git a/doc/bundle-macosx.txt b/doc/bundle-macosx.txt index d95bdf9..cfdca55 100644 --- a/doc/bundle-macosx.txt +++ b/doc/bundle-macosx.txt @@ -107,33 +107,9 @@ Copy files into the bundle. $ cp ~/pyobfsproxy/{LICENSE,README} Contents/Resources/Docs/PyObfsproxy $ find Contents/MacOS -name '*.pyc' | xargs rm -f -Make the second half of Library/Vidalia/torrc look like this. - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60 -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed +Append bundle-torrc-macosx to the end of Library/Vidalia/torrc. + + $ cat ~/flashproxy/doc/bundle-torrc-macosx >> Library/Vidalia/torrc Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. diff --git a/doc/bundle-torrc-gnulinux b/doc/bundle-torrc-gnulinux new file mode 100644 index 0000000..3dc7b16 --- /dev/null +++ b/doc/bundle-torrc-gnulinux @@ -0,0 +1,26 @@ + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 + +Bridge obfs2 109.163.233.198:1051 +Bridge obfs2 83.212.100.216:47870 +Bridge obfs2 83.212.96.182:46602 +Bridge obfs2 109.105.109.163:46924 +Bridge obfs2 70.182.182.109:54542 +Bridge obfs2 169.229.59.74:32779 +Bridge obfs2 169.229.59.75:47809 +Bridge obfs2 209.141.36.236:60783 +Bridge obfs2 208.79.90.242:55564 +Bridge obfs2 128.31.0.34:1051 +Bridge obfs2 83.212.101.2:45235 + +Bridge obfs3 83.212.101.2:42782 + +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec ./App/flashproxy-client --register :0 :9000 +ClientTransportPlugin obfs2,obfs3 exec ./App/pyobfsproxy managed diff --git a/doc/bundle-torrc-macosx b/doc/bundle-torrc-macosx new file mode 100644 index 0000000..4624f68 --- /dev/null +++ b/doc/bundle-torrc-macosx @@ -0,0 +1,26 @@ + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 + +Bridge obfs2 109.163.233.198:1051 +Bridge obfs2 83.212.100.216:47870 +Bridge obfs2 83.212.96.182:46602 +Bridge obfs2 109.105.109.163:46924 +Bridge obfs2 70.182.182.109:54542 +Bridge obfs2 169.229.59.74:32779 +Bridge obfs2 169.229.59.75:47809 +Bridge obfs2 209.141.36.236:60783 +Bridge obfs2 208.79.90.242:55564 +Bridge obfs2 128.31.0.34:1051 +Bridge obfs2 83.212.101.2:45235 + +Bridge obfs3 83.212.101.2:42782 + +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 +ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed diff --git a/doc/bundle-torrc-windows b/doc/bundle-torrc-windows new file mode 100644 index 0000000..4624f68 --- /dev/null +++ b/doc/bundle-torrc-windows @@ -0,0 +1,26 @@ + +UseBridges 1 +# The address and port are ignored by the client transport plugin. +Bridge websocket 0.0.1.0:1 + +Bridge obfs2 109.163.233.198:1051 +Bridge obfs2 83.212.100.216:47870 +Bridge obfs2 83.212.96.182:46602 +Bridge obfs2 109.105.109.163:46924 +Bridge obfs2 70.182.182.109:54542 +Bridge obfs2 169.229.59.74:32779 +Bridge obfs2 169.229.59.75:47809 +Bridge obfs2 209.141.36.236:60783 +Bridge obfs2 208.79.90.242:55564 +Bridge obfs2 128.31.0.34:1051 +Bridge obfs2 83.212.101.2:45235 + +Bridge obfs3 83.212.101.2:42782 + +LearnCircuitBuildTimeout 0 +CircuitBuildTimeout 60 +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 +ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index dd7477d..83115a6 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -203,33 +203,9 @@ LIBEAY32.dll and SSLEAY32.dll from being overwritten. $ mkdir -p Docs/PyObfsproxy $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy -Make the second half of Data/Tor/torrc look like this. - -UseBridges 1 -# The address and port are ignored by the client transport plugin. -Bridge websocket 0.0.1.0:1 - -Bridge obfs2 109.163.233.198:1051 -Bridge obfs2 83.212.100.216:47870 -Bridge obfs2 83.212.96.182:46602 -Bridge obfs2 109.105.109.163:46924 -Bridge obfs2 70.182.182.109:54542 -Bridge obfs2 169.229.59.74:32779 -Bridge obfs2 169.229.59.75:47809 -Bridge obfs2 209.141.36.236:60783 -Bridge obfs2 208.79.90.242:55564 -Bridge obfs2 128.31.0.34:1051 -Bridge obfs2 83.212.101.2:45235 - -Bridge obfs3 83.212.101.2:42782 - -LearnCircuitBuildTimeout 0 -CircuitBuildTimeout 60 -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin websocket exec flashproxy-client --register :0 :9000 -ClientTransportPlugin obfs2,obfs3 exec pyobfsproxy managed +Append bundle-torrc-windows to the end of Data/Tor/torrc. + + $ cat ~/flashproxy/doc/bundle-torrc-windows >> Data/Tor/torrc Re-zip the bundle. The "alpha" number should be independent of the browser bundle's alpha. The 7zg program (as opposed to 7z) causes the

1 0

[flashproxy/master] Add PT bundle-building makefile, working for gnulinux-i686.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit 4977eb1a264c2df1f0021013d2edab414aa39a74 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 18:17:30 2013 -0700 Add PT bundle-building makefile, working for gnulinux-i686. --- doc/Makefile | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..5ed4118 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,70 @@ +BUNDLE_VERSION = 2.4.11 +BUNDLE_RELEASE = alpha-2 +PT_BUNDLE_RELEASE = pt1 + +FLASHPROXY_HOME = $(HOME)/flashproxy +FLASHPROXY_VERSION = 1.0 +FLASHPROXY_DIST = $(FLASHPROXY_HOME)/dist/flashproxy-client-$(FLASHPROXY_VERSION) +PYOBFSPROXY_HOME = $(HOME)/pyobfsproxy +PYOBFSPROXY_DIST = $(PYOBFSPROXY_HOME) + +DOWNLOADDIR = download +WORKDIR = work + +BUNDLE_DIST_URL = https://www.torproject.org/dist/torbrowser + +BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE) +PT_BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE)-$(PT_BUNDLE_RELEASE) + +BUNDLE_GNULINUX_I686 = tor-browser-gnu-linux-i686-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz + +PT_BUNDLE_GNULINUX_I686 = tor-pluggable-transports-browser-gnu-linux-i686-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz + +all: + @echo "Try one of these:" + @echo $$'\tmake gnulinux-i686' + @echo + @echo "Configure version numbers at the top of this makefile." + @echo "Before starting, you need to run \"make dist\" in the flashproxy directory." + +gnulinux-i686: $(PT_BUNDLE_GNULINUX_I686) + +$(PT_BUNDLE_GNULINUX_I686): WORKDIR = work/gnulinux-i686-$(PT_BUNDLE_VERSION_STRING) +$(PT_BUNDLE_GNULINUX_I686): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_I686) + +$(PT_BUNDLE_GNULINUX_I686): TBBDIR = $(WORKDIR)/tor-browser_en-US +$(PT_BUNDLE_GNULINUX_I686): + # Download and check signature. + $(MAKE) checksig-$(BUNDLE_GNULINUX) + + rm -rf "$(WORKDIR)" + mkdir -p "$(WORKDIR)" + tar zxf "$(BUNDLE_GNULINUX)" -C "$(WORKDIR)" + + cp "$(FLASHPROXY_DIST)"/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} "$(TBBDIR)"/App + cp -rL /usr/lib/pymodules/python2.6/M2Crypto "$(TBBDIR)"/App + mkdir -p "$(TBBDIR)"/Docs/FlashProxy + cp "$(FLASHPROXY_DIST)"/{doc/*,README,LICENSE,ChangeLog} "$(TBBDIR)"/Docs/FlashProxy + cp -rL "$(PYOBFSPROXY_DIST)"/{obfsproxy,bin/pyobfsproxy} "$(TBBDIR)"/App + cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} "$(TBBDIR)"/App + cp -rL /usr/lib/pymodules/python2.6/argparse.py "$(TBBDIR)"/App + cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib "$(TBBDIR)"/App + mkdir -p "$(TBBDIR)"/Docs/PyObfsproxy + cp "$(PYOBFSPROXY_DIST)"/{LICENSE,README} "$(TBBDIR)"/Docs/PyObfsproxy + find "$(TBBDIR)"/App -name '*.pyc' | xargs rm -f + + cat "$(FLASHPROXY_HOME)"/doc/bundle-torrc-gnulinux >> "$(TBBDIR)"/Data/Tor/torrc + + tar czf "$@" -C "$(WORKDIR)" tor-browser_en-US + +# Download targets. +$(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc: + rm -f "$@" + wget --no-clobber "$(BUNDLE_DIST_URL)/linux/$@" + +checksig-%: % %.asc + gpg --verify "$*".asc "$*" + +# Need Bash for certain wildcards. +SHELL = /bin/bash +.PHONY: checksig-% gnulinux-i686

1 0

[flashproxy/master] Add bundle-building support for gnulinux-x86_64.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit 7ec5e140240432256f776513bdff047fd1a7c1e0 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 18:42:07 2013 -0700 Add bundle-building support for gnulinux-x86_64. --- doc/Makefile | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 5ed4118..9ebd485 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -17,23 +17,31 @@ BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE) PT_BUNDLE_VERSION_STRING = $(BUNDLE_VERSION)-$(BUNDLE_RELEASE)-$(PT_BUNDLE_RELEASE) BUNDLE_GNULINUX_I686 = tor-browser-gnu-linux-i686-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz +BUNDLE_GNULINUX_X86_64 = tor-browser-gnu-linux-x86_64-$(BUNDLE_VERSION_STRING)-dev-en-US.tar.gz PT_BUNDLE_GNULINUX_I686 = tor-pluggable-transports-browser-gnu-linux-i686-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz +PT_BUNDLE_GNULINUX_X86_64 = tor-pluggable-transports-browser-gnu-linux-x86_64-$(PT_BUNDLE_VERSION_STRING)-dev-en-US.tar.gz all: @echo "Try one of these:" @echo $$'\tmake gnulinux-i686' + @echo $$'\tmake gnulinux-x86_64' @echo @echo "Configure version numbers at the top of this makefile." @echo "Before starting, you need to run \"make dist\" in the flashproxy directory." gnulinux-i686: $(PT_BUNDLE_GNULINUX_I686) +gnulinux-x86_64: $(PT_BUNDLE_GNULINUX_X86_64) $(PT_BUNDLE_GNULINUX_I686): WORKDIR = work/gnulinux-i686-$(PT_BUNDLE_VERSION_STRING) $(PT_BUNDLE_GNULINUX_I686): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_I686) -$(PT_BUNDLE_GNULINUX_I686): TBBDIR = $(WORKDIR)/tor-browser_en-US -$(PT_BUNDLE_GNULINUX_I686): +$(PT_BUNDLE_GNULINUX_X86_64): WORKDIR = work/gnulinux-x86_64-$(PT_BUNDLE_VERSION_STRING) +$(PT_BUNDLE_GNULINUX_X86_64): BUNDLE_GNULINUX = $(BUNDLE_GNULINUX_X86_64) + +# Shared GNU/Linux 32-bit and 64-bit target. +$(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): TBBDIR = $(WORKDIR)/tor-browser_en-US +$(PT_BUNDLE_GNULINUX_I686) $(PT_BUNDLE_GNULINUX_X86_64): # Download and check signature. $(MAKE) checksig-$(BUNDLE_GNULINUX) @@ -58,7 +66,8 @@ $(PT_BUNDLE_GNULINUX_I686): tar czf "$@" -C "$(WORKDIR)" tor-browser_en-US # Download targets. -$(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc: +$(BUNDLE_GNULINUX_I686) $(BUNDLE_GNULINUX_I686).asc \ +$(BUNDLE_GNULINUX_X86_64) $(BUNDLE_GNULINUX_X86_64).asc: rm -f "$@" wget --no-clobber "$(BUNDLE_DIST_URL)/linux/$@" @@ -67,4 +76,4 @@ checksig-%: % %.asc # Need Bash for certain wildcards. SHELL = /bin/bash -.PHONY: checksig-% gnulinux-i686 +.PHONY: checksig-% gnulinux-i686 gnulinux-x86_64

1 0

[flashproxy/master] Update bundle-gnulinux.txt to use the makefile.
by dcf＠torproject.org 07 Apr '13

07 Apr '13

commit 0932292b10991f6b9b95a5596968094d4f09ff0b Author: David Fifield <david(a)bamsoftware.com> Date: Sat Apr 6 18:59:57 2013 -0700 Update bundle-gnulinux.txt to use the makefile. --- doc/bundle-gnulinux.txt | 60 ++++++++++------------------------------------ 1 files changed, 13 insertions(+), 47 deletions(-) diff --git a/doc/bundle-gnulinux.txt b/doc/bundle-gnulinux.txt index 7d4778e..84520be 100644 --- a/doc/bundle-gnulinux.txt +++ b/doc/bundle-gnulinux.txt @@ -90,53 +90,19 @@ Update your Debian. $ sudo apt-get update $ sudo apt-get upgrade -Within the VM, download the 32-bit or 64-bit browser bundle from +Enter the doc directory and edit the top of Makefile to set the version +numbers you want to use. + BUNDLE_VERSION = ... + BUNDLE_RELEASE = ... + PT_BUNDLE_RELEASE = pt1 +The latest Tor Browser Bundle version number can be found at https://www.torproject.org/projects/torbrowser.html.en#Download-torbrowserb…. -The instructions below are for the 32-bit (i686) version. +PT_BUNDLE_RELEASE release should increment each time you build a new +bundle with the same BUNDLE_VERSION and BUNDLE_RELEASE, and be reset to +"pt1" when either of those change. -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz.asc +Run one of these two commands, depending on the platform: + $ make gnulinux-i686 + $ make gnulinux-x86_64 -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.11-alpha-1-dev-en-US.tar.gz -https://www.torproject.org/dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-2.4.11-alpha-1-dev-en-US.tar.gz.asc - -Extract the bundle. - - $ gpg --verify tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz.asc - $ rm -r tor-browser_en-US - $ tar xzvf tor-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz - -Copy files into the bundle. - - $ cd tor-browser_en-US - $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{flashproxy-client,flashproxy-reg-email,flashproxy-reg-http,flashproxy-reg-url} App - $ cp -rL /usr/lib/pymodules/python2.6/M2Crypto App - $ mkdir -p Docs/FlashProxy - $ cp ~/flashproxy/dist/flashproxy-client-VERSION/{doc/*,README,LICENSE,ChangeLog} Docs/FlashProxy - $ cp -rL ~/pyobfsproxy/{obfsproxy,bin/pyobfsproxy} App - $ cp -rL /usr/lib/python2.6/dist-packages/{Crypto,twisted,zope} App - $ cp -rL /usr/lib/pymodules/python2.6/argparse.py App - $ cp -rL /usr/local/lib/python2.6/dist-packages/pyptlib App - $ mkdir -p Docs/PyObfsproxy - $ cp ~/pyobfsproxy/{LICENSE,README} Docs/PyObfsproxy - $ find App -name '*.pyc' | xargs rm -f - -Append bundle-torrc-gnulinux to the end of Data/Tor/torrc. - - $ cat ~/flashproxy/doc/bundle-torrc-gnulinux >> Data/Tor/torrc - -Re-zip the bundle. The "alpha" number should be independent of the -browser bundle's alpha. - - $ cd .. - $ tar czvf tor-pluggable-transports-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tor-browser_en-US - -Test running the bundle. Extract into a separate directory, double-click -the icon to unzip, and run TorBrowser_en-US.app. - - $ mkdir tmp - $ cp tor-pluggable-transports-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz tmp - $ cd tmp - $ tar xzvf tor-pluggable-transports-browser-gnu-linux-i686-2.4.11-alpha-1-dev-en-US.tar.gz - $ cd tor-browser_en-US - $ ./start-tor-browser +Test running the bundle.

1 0

[stem/master] Adding a change log page
by atagar＠torproject.org 07 Apr '13

07 Apr '13

commit ad6973d05a0b25dc80768264a41cb717326c75f3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 6 21:47:44 2013 -0700 Adding a change log page As changes accumulate we need a page to convey them to our users. Adding a change log that both has this, and information about what our versioning means. --- docs/_static/buttons/change_log.png | Bin 0 -> 13319 bytes docs/_static/buttons/resources/change_log.xcf | Bin 0 -> 47006 bytes docs/_static/logo.svg | 104 +++++++++++++++++++++++++ docs/change_log.rst | 65 +++++++++++++++ docs/contents.rst | 1 + docs/index.rst | 8 ++ 6 files changed, 178 insertions(+), 0 deletions(-) diff --git a/docs/_static/buttons/change_log.png b/docs/_static/buttons/change_log.png new file mode 100644 index 0000000..9455307 Binary files /dev/null and b/docs/_static/buttons/change_log.png differ diff --git a/docs/_static/buttons/resources/change_log.xcf b/docs/_static/buttons/resources/change_log.xcf new file mode 100644 index 0000000..df8246d Binary files /dev/null and b/docs/_static/buttons/resources/change_log.xcf differ diff --git a/docs/_static/logo.svg b/docs/_static/logo.svg new file mode 100644 index 0000000..aae9861 --- /dev/null +++ b/docs/_static/logo.svg @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + width="215.122" + height="261.156" + id="svg2" + inkscape:version="0.48.1 r9760" + sodipodi:docname="logo2.svg"> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="754" + inkscape:window-height="480" + id="namedview7" + showgrid="false" + inkscape:zoom="1.1678843" + inkscape:cx="131.87707" + inkscape:cy="130.578" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <defs + id="defs4" /> + <metadata + id="metadata6"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:title></dc:title> + <dc:description>Green plant seedling.</dc:description> + <dc:subject> + <rdf:Bag> + <rdf:li>plant</rdf:li> + <rdf:li>seeding</rdf:li> + <rdf:li>seed</rdf:li> + <rdf:li>floral</rdf:li> + <rdf:li>green</rdf:li> + </rdf:Bag> + </dc:subject> + <dc:publisher> + <cc:Agent + rdf:about="http://www.openclipart.org"> + <dc:title>Open Clip Art Library</dc:title> + </cc:Agent> + </dc:publisher> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Jankiewicz</dc:title> + </cc:Agent> + </dc:creator> + <dc:rights> + <cc:Agent> + <dc:title>Jakub Jankiewicz</dc:title> + </cc:Agent> + </dc:rights> + <dc:date /> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <cc:license + rdf:resource="http://web.resource.org/cc/PublicDomain" /> + <dc:language>pl</dc:language> + </cc:Work> + <cc:License + rdf:about="http://web.resource.org/cc/PublicDomain"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="layer1" + style="fill:#afdcaf;fill-opacity:1" + inkscape:export-filename="/home/atagar/Desktop/stem/docs/_static/logo2.png" + inkscape:export-xdpi="37.4711" + inkscape:export-ydpi="37.4711" + transform="matrix(0.96019699,0,0,0.96019699,0.00453889,10.394562)"> + <path + d="m 175.67323,0 c -6.53936,20.49862 11.98216,25.07135 9.8125,37.75 -16.21643,26.50723 -40.10353,47.89786 -66.46875,64.03125 -18.47147,9.021 -35.644461,21.42547 -47.718751,38.28125 -25.349987,34.75939 -32.2853,79.04153 -33.21875,121.09375 l 14.5625,0 c -0.4394,-20.50962 0.484795,-41.13419 4.25,-61.34375 6.147953,-32.99885 22.2559,-65.86992 51.031251,-84.65625 18.76336,-10.78918 36.13593,-24.00542 50.9375,-39.84375 17.04635,-5.01991 29.21357,18.791 56.375,3.6875 -6.07644,-13.84618 -19.28417,-19.23183 -28.25,-18.71875 -7.97237,-0.15627 -12.98268,0.50969 -17.375,2.6875 6.22703,-7.5205 12.07655,-15.44384 16.46875,-24.0625 6.58271,-8.96555 8.1018,-12.14722 5.75,-22.75 C 190.9764,10.16834 185.62291,2.1714 175.67323,0 z M 95.204479,29.9375 c 3.27593,22.58599 -8.684794,36.053528 3.736008,50.862176 9.139373,10.896379 19.138633,11.121284 33.232743,8.825324 -7.94795,-1.45498 -11.96121,-3.178239 -16.98274,-6.599113 -11.38727,-7.757481 -6.99319,-17.291516 -13.16069,-31.355645 6.13 633,9.641467 4.26256,20.321589 9.56157,25.850282 6.53624,6.819543 13.32978,7.303426 22.30061,10.260726 C 108.37583,66.061512 130.80318,55.813871 95.204479,29.9375 z m -94.1875002,57 c 8.0717369,34.5364 -9.898603,49.23411 5.75,67.75 12.6187422,14.93086 23.9193802,13.12802 39.0625002,12.71875 0,0 -20.230315,-7.91977 -25.982742,-19.97528 -5.701498,-11.94877 6.497073,-19.14146 -8.934234,-48.86101 15.099529,24.59757 7.005263,36.92543 10.152984,46.32976 4.320676,12.90873 27.295242,18.91278 27.295242,18.91278 C 19.522068,145.97779 52.836331,98.52529 1.0169788,86.9375 z M 142.67323,134.96875 c -42.63044,0.46206 -43.690787,33.2614 -79.156251,53.5625 13.965964,3.10355 30.015142,-1.93566 46.326491,-16.3751 8.24088,-7.29515 11.30245,-19.83583 37.03125,-26.47752 -29.83203,10.75162 -23.33683,18.90123 -39.78125,32.10252 -8.480769,6.80821 -22.980278,18.14644 -42.982741,15.09385 13.17746,12.90681 30.83981,17.14209 57.812501,3.15625 25.60947,-13.27898 20.43491,-28.48638 46.125,-58.53125 -10.0 8886,-1.81722 -18.39911,-2.60686 -25.375,-2.53125 z" + id="path2985" + style="fill:#afdcaf;fill-opacity:1;stroke:none" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/docs/change_log.rst b/docs/change_log.rst new file mode 100644 index 0000000..696bfda --- /dev/null +++ b/docs/change_log.rst @@ -0,0 +1,65 @@ +Change Log +========== + +The following is a log of all user-facing changes to stem, both released and +unreleased. For a monthly report on work being done see my `development log +<http://www.atagar.com/log.php>`_. + +* :ref:`versioning` +* :ref:`unreleased` +* :ref:`version_1.0` + +.. _versioning: + +Versioning +---------- + +Stem uses `semantic versioning <http://semver.org/>`_, which means that +**versions consist of three numbers** (such as '**1.2.4**'). These are used to +convey the kind of backward compatibility a release has... + + * The first value is the **major version**. This changes infrequently, and + indicates that backward incompatible changes have been made (such as the + removal of deprecated functions). + + * The second value is the **minor version**. This is the most common kind of + release, and denotes that the improvements are backward compatible. + + * The third value is the **patch version**. When a stem release has a major + issue another release is made which fixes just that problem. These do not + contain substantial improvements or new features. This value is sometimes + left off to indicate all releases with a given major/minor version. + +.. _unreleased: + +Unreleased +---------- + +The following are only available within stem's `git repository +<download.html>`_. + + * **Controller** + + * :class:`~stem.response.events.AddrMapEvent` support for the new CACHED argument (`ticket <https://trac.torproject.org/8596>`_, `spec <https://gitweb.torproject.org/torspec.git/commitdiff/25b0d43>`_) + + * **Website** + + * Overhaul of stem's `download page <download.html>`_. This included several + improvements, most notably the addition of PyPI, FreeBSD, and RedHat. + * Added this change log. + * Settled on a `logo + <http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html>`_ for + stem. + +.. _version_1.0: + +Version 1.0 +----------- + +This was the `initial release of stem +<https://blog.torproject.org/blog/stem-release-10>`_, made on **March 26th, +2013**. + + * **Version 1.0.1** (March 27th, 2013) - fixed an issue where installing with + python 3.x (python3 setup.py install) resulted in a stacktrace + diff --git a/docs/contents.rst b/docs/contents.rst index e25578a..be34d8f 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -11,6 +11,7 @@ Contents tutorials/mirror_mirror_on_the_wall tutorials/double_double_toil_and_trouble + change_log download api diff --git a/docs/index.rst b/docs/index.rst index 24d773b..0570be3 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -35,6 +35,14 @@ Stem is a python controller library for `Tor <https://www.torproject.org/>`_. Li .. image:: /_static/buttons/bug_tracker.png :target: https://trac.torproject.org/projects/tor/wiki/doc/stem/bugs +.. Nuovo (http://www.silvestre.com.ar/?p=5) + Author: Silvestre Herrera (http://www.silvestre.com.ar/) + License: GPL v2 + File: Nuovo/128x128/mimetypes/gnome-mime-text-log.png + +.. image:: /_static/buttons/change_log.png + :target: change_log.html + .. ColorCons (http://mouserunner.com/Spheres_ColoCons1_Free_Icons.html) Author: Ken Saunders (http://mouserunner.com/MRDS_Cell.html) License: CC v2.5 (A, SA)

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 07 Apr '13

07 Apr '13

commit b60dddb8903c39ea612cb24bc9fbdf43f22474bd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 7 02:45:18 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 3a46268..61da930 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -6,9 +6,9 @@ <body> <h1 id="the-short-user-manual">简明用户手册</h1> <p>本用户手册所含内容：如何下载与使用 Tor，以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案，请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p> - <p>请注意：我们每天收到大量的电子邮件，而我们的支持服务是自愿性的。如果未能及时回复，请不要着急。</p> + <p>请注意：由于每天收到大量的电子邮件，而我们提供的支持服务是志愿性的，因此，如未能及时回复，请勿着急。</p> <h2 id="how-tor-works">Tor 是如何工作的</h2> - <p>Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为<em>“中继”</em>）传送。</p> + <p>Tor 是一个由虚拟通道组成的网络，用于提供用户的互联网安全和隐私。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为<em>“中继”</em>）传送。</p> <p>上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。</p> <p>Tor 会把你的流量来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的流量加密，但不能加密 Tor 网络与最终目的地之间的流量。</p> <p>如果你是在交流敏感信息，例如以用户名和密码登录一个网站，请确保你在使用 HTTPS （如 <strong>https</strong>://torproject.org/，而不是 <strong>http</strong>://torproject.org/）。</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 07 Apr '13

07 Apr '13

commit 82d58e1f8f9ae916ec468f6bf43925ec861e936f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 7 02:45:14 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 3a46268..61da930 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -6,9 +6,9 @@ <body> <h1 id="the-short-user-manual">简明用户手册</h1> <p>本用户手册所含内容：如何下载与使用 Tor，以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案，请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p> - <p>请注意：我们每天收到大量的电子邮件，而我们的支持服务是自愿性的。如果未能及时回复，请不要着急。</p> + <p>请注意：由于每天收到大量的电子邮件，而我们提供的支持服务是志愿性的，因此，如未能及时回复，请勿着急。</p> <h2 id="how-tor-works">Tor 是如何工作的</h2> - <p>Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为<em>“中继”</em>）传送。</p> + <p>Tor 是一个由虚拟通道组成的网络，用于提供用户的互联网安全和隐私。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为<em>“中继”</em>）传送。</p> <p>上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。</p> <p>Tor 会把你的流量来源匿名化，并且把介于你和 Tor 网络中传送的所有内容加密。Tor 也会把你在 Tor 网络内部的流量加密，但不能加密 Tor 网络与最终目的地之间的流量。</p> <p>如果你是在交流敏感信息，例如以用户名和密码登录一个网站，请确保你在使用 HTTPS （如 <strong>https</strong>://torproject.org/，而不是 <strong>http</strong>://torproject.org/）。</p>

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 07 Apr '13

07 Apr '13

commit 011ba5c982982e6b2cb8ec4bfc7f9bf6f22ed671 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 7 02:15:18 2013 +0000 Update translations for tsum_completed --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 1bcd132..3a46268 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -5,8 +5,8 @@ </head> <body> <h1 id="the-short-user-manual">简明用户手册</h1> - <p>本用户手册的内容有：如何下载 Tor、如何使用 Tor，以及当 Tor 无法连接到网络时该怎么办。如果你没能在本手册内找到你需要的答案，请发送电子邮件至 help(a)rt.torproject.org 。</p> - <p>请注意，我们是以自愿为基础提供支持，我们每天都收到大量的电子邮件。如果我们没有即时回复，请不要担心。</p> + <p>本用户手册所含内容：如何下载与使用 Tor，以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案，请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p> + <p>请注意：我们每天收到大量的电子邮件，而我们的支持服务是自愿性的。如果未能及时回复，请不要着急。</p> <h2 id="how-tor-works">Tor 是如何工作的</h2> <p>Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为<em>“中继”</em>）传送。</p> <p>上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。</p>

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 07 Apr '13

07 Apr '13

commit 6cfe54158df2ed9d6b876f70b78f1337fc3a1878 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 7 02:15:15 2013 +0000 Update translations for tsum --- zh_CN/short-user-manual_zh_CN_noimg.xhtml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zh_CN/short-user-manual_zh_CN_noimg.xhtml b/zh_CN/short-user-manual_zh_CN_noimg.xhtml index 1bcd132..3a46268 100644 --- a/zh_CN/short-user-manual_zh_CN_noimg.xhtml +++ b/zh_CN/short-user-manual_zh_CN_noimg.xhtml @@ -5,8 +5,8 @@ </head> <body> <h1 id="the-short-user-manual">简明用户手册</h1> - <p>本用户手册的内容有：如何下载 Tor、如何使用 Tor，以及当 Tor 无法连接到网络时该怎么办。如果你没能在本手册内找到你需要的答案，请发送电子邮件至 help(a)rt.torproject.org 。</p> - <p>请注意，我们是以自愿为基础提供支持，我们每天都收到大量的电子邮件。如果我们没有即时回复，请不要担心。</p> + <p>本用户手册所含内容：如何下载与使用 Tor，以及 Tor 无法连接到网络时该怎么办。如果本手册未提供你所需的答案，请发送电子邮件至 help-zh(a)rt.torproject.xn--org()-8n1h080l.</p> + <p>请注意：我们每天收到大量的电子邮件，而我们的支持服务是自愿性的。如果未能及时回复，请不要着急。</p> <h2 id="how-tor-works">Tor 是如何工作的</h2> <p>Tor 是一个由虚拟通道组成的网络，能改善你的互联网隐私与安全。在你的网络流量被发送至公共互联网之前，Tor 会先把它们经由 Tor 网络中的三台随机服务器（也称为<em>“中继”</em>）传送。</p> <p>上图描绘了一个用户通过 Tor 浏览不同的网站。绿色的显示器代表着 Tor 网络里的中继服务器，三把钥匙则代表该用户与每个中继之间的加密层。</p>

1 0

[stem/master] Settling on a logo for stem
by atagar＠torproject.org 07 Apr '13

07 Apr '13

commit 64fef2d9ee6ab5aefc597eb4f68c910df8f0a197 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 6 18:13:35 2013 -0700 Settling on a logo for stem Using Jakub Jankiewicz's WPClipart image as the logo for stem. This image is under the public domain, and a very nice fit for our library. :) --- docs/_static/logo.png | Bin 8795 -> 3382 bytes docs/_static/logo.xcf | Bin 21547 -> 0 bytes docs/conf.py | 3 ++- 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/docs/_static/logo.png b/docs/_static/logo.png index ffd4927..f8b2d87 100644 Binary files a/docs/_static/logo.png and b/docs/_static/logo.png differ diff --git a/docs/_static/logo.xcf b/docs/_static/logo.xcf deleted file mode 100644 index f5ee554..0000000 Binary files a/docs/_static/logo.xcf and /dev/null differ diff --git a/docs/conf.py b/docs/conf.py index ada61ec..71b89b5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -117,7 +117,8 @@ html_short_title = 'Stem Docs' # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None + +html_logo = 'logo.png' # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32

1 0