[tor-commits] [flashproxy/master] Catch exceptions that happen during ProxyPair connections.

2012-06-05 Thread dcf
commit 07dc549ef49061f153adcbc16f3e4e31643c5607 Author: David Fifield Date: Tue Jun 5 22:29:43 2012 -0700 Catch exceptions that happen during ProxyPair connections. --- flashproxy.js |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/flashproxy.js b/flashproxy.

[tor-commits] [flashproxy/master] Use plain http (not https) in embed links.

2012-06-05 Thread dcf
commit 1caa8dad46cd4a803036ebc0b76f4f9e6784e196 Author: David Fifield Date: Tue Jun 5 22:10:18 2012 -0700 Use plain http (not https) in embed links. Using https would be preferable, which is why I changed this to explicit https in 836b7a27. But I learned that Firefox doesn't al

[tor-commits] [tor/master] use my time machine to fix a few more typos

2012-06-05 Thread arma
commit 0ee13dc287320c0b1aeffb0854534ee1d8b561b2 Author: Roger Dingledine Date: Wed Jun 6 00:30:25 2012 -0400 use my time machine to fix a few more typos --- ChangeLog| 10 +- ReleaseNotes |2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/Ch

[tor-commits] [stem/master] Merging changes for sphinx documentation

2012-06-05 Thread atagar
commit 38adeda918ffc1367ec8eb8dc0002bd737ad95c6 Merge: 2a21ec5 8badba1 Author: Damian Johnson Date: Tue Jun 5 21:28:53 2012 -0700 Merging changes for sphinx documentation .gitignore |3 + docs/Makefile | 133 + docs/conf.

[tor-commits] [stem/master] Converting stem.util.tor_tools to reStructuredText

2012-06-05 Thread atagar
commit 12af869b1f669117de736c86f3e094ad2e467be4 Author: Damian Johnson Date: Tue Jun 5 20:08:57 2012 -0700 Converting stem.util.tor_tools to reStructuredText --- stem/util/tor_tools.py | 14 +- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/stem/util/tor_tools

[tor-commits] [stem/master] Converting stem.descriptor.* to reStructuredText

2012-06-05 Thread atagar
commit 4819e2fc97f76424a3dead741d327be711f53a8d Author: Damian Johnson Date: Tue Jun 5 21:15:37 2012 -0700 Converting stem.descriptor.* to reStructuredText Fingers so sore... --- stem/descriptor/__init__.py | 74 - stem/descriptor/extrainfo_descriptor.py | 2

[tor-commits] [stem/master] Targeting contents at top of modules

2012-06-05 Thread atagar
commit 8badba152f5d9b2a83a9b9893c328cd23dd219a2 Author: Damian Johnson Date: Tue Jun 5 21:22:49 2012 -0700 Targeting contents at top of modules For modules like stem.response and stem.util I was linking to the first anchor, which isn't the behavor I wanted (skips the title at

[tor-commits] [stem/master] Converting stem.util.system to reStructuredText

2012-06-05 Thread atagar
commit 3319642a609cd4995724877b90af76cd44067085 Author: Damian Johnson Date: Tue Jun 5 20:02:20 2012 -0700 Converting stem.util.system to reStructuredText --- stem/util/system.py | 126 ++- 1 files changed, 54 insertions(+), 72 deletions(-)

[tor-commits] [stem/master] Removing double backticks from None documentation

2012-06-05 Thread atagar
commit e13ea63c09e766d15c36983c9b37f6adde1a2bde Author: Damian Johnson Date: Tue Jun 5 20:14:39 2012 -0700 Removing double backticks from None documentation Double backticks should be monospaced, but with the haiku theme it's an inverted background with is far more noticeable.

[tor-commits] [stem/master] Converting stem.util.term to reStructuredText

2012-06-05 Thread atagar
commit fa60694958ed41a323a099e844ce92fb48faa373 Author: Damian Johnson Date: Tue Jun 5 20:06:31 2012 -0700 Converting stem.util.term to reStructuredText --- stem/util/term.py | 27 +-- 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/stem/util/term.

[tor-commits] [stem/master] Converting stem.util.log to reStructuredText

2012-06-05 Thread atagar
commit 1e04a08e75ae73f204c6ba3d4f8eef33104973f5 Author: Damian Johnson Date: Tue Jun 5 19:40:57 2012 -0700 Converting stem.util.log to reStructuredText --- stem/util/log.py | 86 +- 1 files changed, 40 insertions(+), 46 deletions(-) di

[tor-commits] [stem/master] Converting stem.util.proc to reStructuredText

2012-06-05 Thread atagar
commit 57e11a1345ed5547424b03fc5f7d9e663c4661ea Author: Damian Johnson Date: Tue Jun 5 19:53:00 2012 -0700 Converting stem.util.proc to reStructuredText --- stem/util/proc.py | 140 + 1 files changed, 56 insertions(+), 84 deletions(-) d

[tor-commits] [stem/master] Converting stem.util.enum to reStructuredText

2012-06-05 Thread atagar
commit d5ef02b04eccebef5d5bbf89003431c0d41f1401 Author: Damian Johnson Date: Tue Jun 5 19:33:10 2012 -0700 Converting stem.util.enum to reStructuredText --- stem/util/enum.py | 113 ++--- 1 files changed, 56 insertions(+), 57 deletions(-) d

[tor-commits] [stem/master] Converting stem.util.conf to reStructuredText

2012-06-05 Thread atagar
commit 1b23a2da711b202a9fba24f47c173f09024efa34 Author: Damian Johnson Date: Tue Jun 5 19:22:52 2012 -0700 Converting stem.util.conf to reStructuredText --- docs/index.rst|5 + stem/util/conf.py | 304 ++--- 2 files changed, 152 inse

[tor-commits] [stem/master] Converting stem.control to reStructuredText

2012-06-05 Thread atagar
commit cbcf257ee91f78a58984a2335814a589c51f14e9 Author: Damian Johnson Date: Tue Jun 5 07:54:20 2012 -0700 Converting stem.control to reStructuredText --- docs/index.rst |5 ++ stem/control.py | 144 --- 2 files changed, 68 insertio

[tor-commits] [stem/master] Converting stem.socket to reStructuredText

2012-06-05 Thread atagar
commit c350257b05455509ab99c9019747e63553a668d5 Author: Damian Johnson Date: Tue Jun 5 08:25:48 2012 -0700 Converting stem.socket to reStructuredText --- docs/index.rst |5 ++ stem/control.py |2 + stem/socket.py | 209 +-- 3 f

[tor-commits] [stem/master] Converting stem.util.connection to reStructuredText

2012-06-05 Thread atagar
commit c1392cd8b3322be4b39980dea54d5b224ed7062f Author: Damian Johnson Date: Tue Jun 5 19:26:54 2012 -0700 Converting stem.util.connection to reStructuredText --- stem/util/connection.py | 26 +- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/stem

[tor-commits] [stem/master] Converting stem.response to reStructuredText

2012-06-05 Thread atagar
commit 68dc6af5c74cd8b733b07542c88f5af96bb146be Author: Damian Johnson Date: Tue Jun 5 09:31:55 2012 -0700 Converting stem.response to reStructuredText --- docs/index.rst|7 +- stem/response/__init__.py | 206 - stem/response

[tor-commits] [stem/master] Converting stem.connection to reStructuredText

2012-06-05 Thread atagar
commit f46b5c7c0e543d90f26155e472a1658827c5f8fe Author: Damian Johnson Date: Sun Jun 3 21:23:49 2012 -0700 Converting stem.connection to reStructuredText --- docs/index.rst |5 + stem/connection.py | 456 +--- 2 files changed, 225 in

[tor-commits] [stem/master] Adding module overviews back to docs

2012-06-05 Thread atagar
commit 1cfad693de89bc4769605f21d52ef9ba4f38205b Author: Damian Johnson Date: Mon Jun 4 10:04:45 2012 -0700 Adding module overviews back to docs One bit of documentation that I've found very useful, and sphinx lacks, is a brief summary of a module's contents. Hence adding that b

[tor-commits] [stem/master] Switching to the haiku theme

2012-06-05 Thread atagar
commit 1ccf6be7dec076afdf4c4a4150c38b5065a8f17e Author: Damian Johnson Date: Sun Jun 3 16:28:07 2012 -0700 Switching to the haiku theme The haiku theme is lighter, and lacks a left-hand bar which makes the content far less cramped. All in all, looks far nicer for the content t

[tor-commits] [stem/master] Defaulting connect_* to provide a Controller

2012-06-05 Thread atagar
commit c03ebb23ae39f9c9b68a1471dbf3debb30c399a7 Author: Damian Johnson Date: Sun Jun 3 21:26:21 2012 -0700 Defaulting connect_* to provide a Controller As a TODO comment mentioned, the connect_* convenience functions were supposed to provide a higher level controller class whe

[tor-commits] [stem/master] Adding module metadata (author, version, etc)

2012-06-05 Thread atagar
commit 5c9579626a131e8bd17c283e0904525e30fe4488 Author: Damian Johnson Date: Sat Jun 2 11:06:42 2012 -0700 Adding module metadata (author, version, etc) --- stem/__init__.py |8 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py

[tor-commits] [stem/master] Missed linking a funcion

2012-06-05 Thread atagar
commit 438dc79a512879473499211988a86e08099720de Author: Damian Johnson Date: Sun Jun 3 16:21:26 2012 -0700 Missed linking a funcion --- stem/process.py |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stem/process.py b/stem/process.py index 0224e3e..5df04dc 100

[tor-commits] [stem/master] Initial sphinx autogenerated content

2012-06-05 Thread atagar
commit feeac963d1383b9eb5a08251dbd329ff64f1b846 Author: Damian Johnson Date: Thu May 31 09:57:51 2012 -0700 Initial sphinx autogenerated content Results right after running 'sphinx-quickstart' --- docs/Makefile | 130 ++ docs/conf.py | 216

[tor-commits] [stem/master] Converting stem.version to reStructuredText

2012-06-05 Thread atagar
commit ecc0e86d46ac2db77d45d46af5ac50168befa6c9 Author: Damian Johnson Date: Sun Jun 3 16:18:00 2012 -0700 Converting stem.version to reStructuredText --- docs/conf.py|3 +-- docs/index.rst |5 + stem/version.py | 54 +++---

[tor-commits] [stem/master] Converting stem.process to reStructuredText

2012-06-05 Thread atagar
commit 6651e8304a3cee2ffed344371c830a6014853201 Author: Damian Johnson Date: Sun Jun 3 15:38:38 2012 -0700 Converting stem.process to reStructuredText --- docs/conf.py|4 +++ docs/index.rst |7 - stem/process.py | 72 +-

[tor-commits] [stem/master] Generating sphinx docs for all stem modules

2012-06-05 Thread atagar
commit 58566d6b2e20899c82206dba50d2aebfa008a96c Author: Damian Johnson Date: Sat Jun 2 18:55:25 2012 -0700 Generating sphinx docs for all stem modules Using the sphinx-apidoc command to generate documentation for all stem modules. I'm doing this via the make file to simplify t

[tor-commits] [stem/master] Removing autogenerated rst files via clean target

2012-06-05 Thread atagar
commit 241359c043c3ffb2d2d15d24cacad6c9d7fd0ae7 Author: Damian Johnson Date: Sun Jun 3 13:13:49 2012 -0700 Removing autogenerated rst files via clean target The html target creates some rst files, so removing them when 'make clean' is ran. --- docs/Makefile |4 ++-- 1 fil

[tor-commits] [stem/master] Skip recreating unchanged docs

2012-06-05 Thread atagar
commit a3a7b2055144ae4ccb06e464510df211fc4fb43a Author: Damian Johnson Date: Sat Jun 2 19:19:24 2012 -0700 Skip recreating unchanged docs Greatly decreasing the time it takes to generate documentation when pydocs haven't changed. Sphinx is smart enough to avoid running against

[tor-commits] [stem/master] Configuring sphinx documentation attributes

2012-06-05 Thread atagar
commit bad7ae65902f648c3127de66a35a95223b6582a6 Author: Damian Johnson Date: Sat Jun 2 11:41:54 2012 -0700 Configuring sphinx documentation attributes Setting attributes and toggling attributes for the autogenerated sphinx documentation. This seems like a pretty slick tool, tho

[tor-commits] [stem/master] Adding basic stem intro to sphinx index

2012-06-05 Thread atagar
commit af83350dcf62f819d8e84c6e34051dc3ff509add Author: Damian Johnson Date: Sat Jun 2 13:35:12 2012 -0700 Adding basic stem intro to sphinx index --- docs/index.rst |6 -- stem/__init__.py |2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/index.rst b

[tor-commits] [stem/master] Ignoring sphinx build output

2012-06-05 Thread atagar
commit ff5257f2e848ed84fa3e8e23b60149d464262c0e Author: Damian Johnson Date: Thu May 31 10:01:30 2012 -0700 Ignoring sphinx build output Build artifacts from sphinx are placed in 'docs/_build/*', so having git ignore it. --- .gitignore |1 + 1 files changed, 1 insertions(

[tor-commits] [tor/release-0.2.2] add release notes too

2012-06-05 Thread arma
commit 78a8df2666923a26c8c12d8a523dd8439e055469 Author: Roger Dingledine Date: Tue Jun 5 19:04:30 2012 -0400 add release notes too --- ReleaseNotes | 27 +++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index c47c33a.

[tor-commits] [tor/release-0.2.2] bump to 0.2.2.37

2012-06-05 Thread arma
commit 96226a638b2634e94383d0c72a4c4f912ebda420 Author: Roger Dingledine Date: Tue Jun 5 18:52:22 2012 -0400 bump to 0.2.2.37 --- configure.in |2 +- contrib/tor-mingw.nsi.in |2 +- src/win32/orconfig.h |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) di

[tor-commits] [tor/release-0.2.2] schedule tomorrow as the 0.2.2.37 release day

2012-06-05 Thread arma
commit c450e524860e23014da250bad88b476d0d540ff9 Author: Roger Dingledine Date: Tue Jun 5 18:50:29 2012 -0400 schedule tomorrow as the 0.2.2.37 release day --- ChangeLog | 27 +++ changes/bug5283 |6 -- changes/bug5969_022 |7 --- chan

[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2

2012-06-05 Thread arma
commit 491dc3a601d7c2610503f73192bd1a40bcb37ab2 Merge: 6d85a79 af54a01 Author: Nick Mathewson Date: Mon Jun 4 11:40:52 2012 -0400 Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2 changes/bug6007|5 + src/or/connection_or.c | 22

[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/bug6033' into maint-0.2.2

2012-06-05 Thread arma
commit 6d85a796539424882f878ccac5ae4640a6fbb561 Merge: b7e863c 841a8d5 Author: Nick Mathewson Date: Mon Jun 4 11:33:27 2012 -0400 Merge remote-tracking branch 'public/bug6033' into maint-0.2.2 changes/bug6033 |6 ++ src/common/tortls.c | 15 +++ 2 files changed,

[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

2012-06-05 Thread arma
commit 4f62f420feb5e5d29ca9db4ea0e486b11023844f Merge: c1414cf 491dc3a Author: Roger Dingledine Date: Tue Jun 5 18:38:32 2012 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug5283|6 ++ changes/bug5969_022|7 +++ changes/bug6007|5

[tor-commits] [tor/release-0.2.2] Kill non-open OR connections with any data on their inbufs.

2012-06-05 Thread arma
commit af54a0182870babec62bf07d067ca82a67c423de Author: Nick Mathewson Date: Thu May 31 11:19:35 2012 -0400 Kill non-open OR connections with any data on their inbufs. This fixes a DoS issue where a client could send so much data in 5 minutes that they exhausted the server's RA

[tor-commits] [tor/release-0.2.2] Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support

2012-06-05 Thread arma
commit 841a8d551abd191b23ad2f78dfb07d9e4ff8ace2 Author: Nick Mathewson Date: Sat Jun 2 20:05:32 2012 -0400 Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 support It appears that when OpenSSL negotiates a 1.1 or 1.2 connection, and it decides to renegotiate, the client

[tor-commits] [tor/release-0.2.2] Make all begindir or one-hop circuits internal

2012-06-05 Thread arma
commit 834654f145cc1205e20cf5f07a37bef2e11252ce Author: Nick Mathewson Date: Tue May 15 09:41:45 2012 -0400 Make all begindir or one-hop circuits internal This solves bug 5283, where client traffic could get sent over the same circuit as an anonymized connection to a directory,

[tor-commits] [tor/release-0.2.2] add changes file for bug 5283

2012-06-05 Thread arma
commit b7e863c07305941d0c12b46da503fca694148abf Author: Roger Dingledine Date: Tue May 15 20:50:29 2012 -0400 add changes file for bug 5283 I called it a bugfix on 0.2.0.10-alpha, since git commit e5885deab is where we introduced anonymized begin_dir connections. --- changes/b

[tor-commits] [tor/release-0.2.2] Fix more clang format-nonliteral warnings (bug 5969)

2012-06-05 Thread arma
commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f Author: Nick Mathewson Date: Wed May 30 19:57:02 2012 -0400 Fix more clang format-nonliteral warnings (bug 5969) --- src/common/log.c |7 +++ src/or/control.c | 16 +--- 2 files changed, 20 insertions(+), 3 deletions(-)

[tor-commits] [tor/release-0.2.2] Add __attribute__(format)s for our varargs printf/scanf wrappers

2012-06-05 Thread arma
commit e28489467233bff4500a70f8a7b22e42ca3b3e68 Author: Nick Mathewson Date: Wed May 30 12:14:38 2012 -0400 Add __attribute__(format)s for our varargs printf/scanf wrappers It turns out that if you set the third argument of __attribute__(format) to 0, GCC and Clang will check t

[tor-commits] [tor/master] bump to 0.2.3.16-alpha-dev

2012-06-05 Thread arma
commit f136e835d8f98a0508bfa418d01c40f0b73935a3 Author: Roger Dingledine Date: Tue Jun 5 18:37:19 2012 -0400 bump to 0.2.3.16-alpha-dev --- configure.in |2 +- contrib/tor-mingw.nsi.in |2 +- src/win32/orconfig.h |2 +- 3 files changed, 3 insertions(+), 3 deleti

[tor-commits] [tor/master] use my time machine to fix the changelog

2012-06-05 Thread arma
commit 9ca5fa5984098e2d3750a85b2ed5420517b7250e Author: Roger Dingledine Date: Tue Jun 5 18:36:58 2012 -0400 use my time machine to fix the changelog --- ChangeLog |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index bac46fd..c0cf4c1 100644

[tor-commits] r25673: {website} 0.2.3.16-alpha tarball is (or at least will be) up (website/trunk/include)

2012-06-05 Thread Roger Dingledine
Author: arma Date: 2012-06-05 22:31:26 + (Tue, 05 Jun 2012) New Revision: 25673 Modified: website/trunk/include/versions.wmi Log: 0.2.3.16-alpha tarball is (or at least will be) up Modified: website/trunk/include/versions.wmi ===

[tor-commits] [tor/master] add a blurb for 0.2.3.16-alpha

2012-06-05 Thread arma
commit e94606a76b98752dac30f366a6eb6877e3438b51 Author: Roger Dingledine Date: Tue Jun 5 18:28:52 2012 -0400 add a blurb for 0.2.3.16-alpha --- ChangeLog |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index a856bb3..bac46fd 100644 --- a/C

[tor-commits] [torbrowser/master] Merge branch 'maint-2.2' into maint-2.3

2012-06-05 Thread erinn
commit 4f99b60629bd66a0b4ac8352ca6aab2a63a1229c Merge: 722cec3 fb9824f Author: Erinn Clark Date: Tue Jun 5 15:55:10 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig |1 + build-scripts/linux.mk |7 ++- build-scripts/windows.mk

[tor-commits] [torbrowser/master] Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway.

2012-06-05 Thread erinn
commit fb9824fa9edd7ae025686e9b5e8b55d5f9640fae Author: Shondoit Walker Date: Mon May 14 14:29:39 2012 +0200 Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway. --- build-scripts/config/dot_mozconfig |1

[tor-commits] [torbrowser/master] Linux: Update the Firefox package sequence to a sane variant.

2012-06-05 Thread erinn
commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef Author: Shondoit Walker Date: Sat Jun 2 11:53:27 2012 +0200 Linux: Update the Firefox package sequence to a sane variant. --- build-scripts/linux.mk |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build-scripts/

[tor-commits] [torbrowser/master] Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs.

2012-06-05 Thread erinn
commit 37142a84f895473db35f1213ff30321d7722b15a Author: Shondoit Walker Date: Tue May 29 23:57:56 2012 +0200 Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs. --- build-scripts/windows.mk |3 ++- 1 files changed, 2

[tor-commits] [torbrowser/master] Move mingw location to the internal path, so that we are not dependant on the install locations.

2012-06-05 Thread erinn
commit 360cb483036ab6ea0728f83f897e546f5bcbafaf Author: Shondoit Walker Date: Sat May 5 00:13:49 2012 +0200 Move mingw location to the internal path, so that we are not dependant on the install locations. --- build-scripts/windows.mk |2 +- 1 files changed, 1 insertions(+), 1 deletion

[tor-commits] [torbrowser/maint-2.3] Fix Zlib's prefix. We now use the sane option.

2012-06-05 Thread erinn
commit dc1c8b67fc6142b2e00f51715cf3f8f7939b7ae3 Author: Shondoit Walker Date: Sat May 12 23:01:25 2012 +0200 Fix Zlib's prefix. We now use the sane option. --- build-scripts/windows.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/bu

[tor-commits] [torbrowser/master] Fix Zlib's prefix. We now use the sane option.

2012-06-05 Thread erinn
commit dc1c8b67fc6142b2e00f51715cf3f8f7939b7ae3 Author: Shondoit Walker Date: Sat May 12 23:01:25 2012 +0200 Fix Zlib's prefix. We now use the sane option. --- build-scripts/windows.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/bu

[tor-commits] [torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3

2012-06-05 Thread erinn
commit 4f99b60629bd66a0b4ac8352ca6aab2a63a1229c Merge: 722cec3 fb9824f Author: Erinn Clark Date: Tue Jun 5 15:55:10 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/config/dot_mozconfig |1 + build-scripts/linux.mk |7 ++- build-scripts/windows.mk

[tor-commits] [torbrowser/maint-2.3] Linux: Update the Firefox package sequence to a sane variant.

2012-06-05 Thread erinn
commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef Author: Shondoit Walker Date: Sat Jun 2 11:53:27 2012 +0200 Linux: Update the Firefox package sequence to a sane variant. --- build-scripts/linux.mk |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build-scripts/

[tor-commits] [torbrowser/maint-2.3] Move mingw location to the internal path, so that we are not dependant on the install locations.

2012-06-05 Thread erinn
commit 360cb483036ab6ea0728f83f897e546f5bcbafaf Author: Shondoit Walker Date: Sat May 5 00:13:49 2012 +0200 Move mingw location to the internal path, so that we are not dependant on the install locations. --- build-scripts/windows.mk |2 +- 1 files changed, 1 insertions(+), 1 deletion

[tor-commits] [torbrowser/maint-2.3] Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway.

2012-06-05 Thread erinn
commit fb9824fa9edd7ae025686e9b5e8b55d5f9640fae Author: Shondoit Walker Date: Mon May 14 14:29:39 2012 +0200 Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway. --- build-scripts/config/dot_mozconfig |1

[tor-commits] [torbrowser/maint-2.3] Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs.

2012-06-05 Thread erinn
commit 37142a84f895473db35f1213ff30321d7722b15a Author: Shondoit Walker Date: Tue May 29 23:57:56 2012 +0200 Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs. --- build-scripts/windows.mk |3 ++- 1 files changed, 2

[tor-commits] [torbrowser/maint-2.2] Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway.

2012-06-05 Thread erinn
commit fb9824fa9edd7ae025686e9b5e8b55d5f9640fae Author: Shondoit Walker Date: Mon May 14 14:29:39 2012 +0200 Disable Firefox' maintenance service. Since we're running portable we don't need it. We don't want FF updates behind our back anyway. --- build-scripts/config/dot_mozconfig |1

[tor-commits] [torbrowser/maint-2.2] Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs.

2012-06-05 Thread erinn
commit 37142a84f895473db35f1213ff30321d7722b15a Author: Shondoit Walker Date: Tue May 29 23:57:56 2012 +0200 Fix build-vidalia to use the actual given QT location. The addition to PATH is required so that cmake can find the DLLs. --- build-scripts/windows.mk |3 ++- 1 files changed, 2

[tor-commits] [torbrowser/maint-2.2] Fix Zlib's prefix. We now use the sane option.

2012-06-05 Thread erinn
commit dc1c8b67fc6142b2e00f51715cf3f8f7939b7ae3 Author: Shondoit Walker Date: Sat May 12 23:01:25 2012 +0200 Fix Zlib's prefix. We now use the sane option. --- build-scripts/windows.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/windows.mk b/bu

[tor-commits] [torbrowser/maint-2.2] Linux: Update the Firefox package sequence to a sane variant.

2012-06-05 Thread erinn
commit 05d3f1baffd6fd17fa47d847f90b9d60f0eca1ef Author: Shondoit Walker Date: Sat Jun 2 11:53:27 2012 +0200 Linux: Update the Firefox package sequence to a sane variant. --- build-scripts/linux.mk |7 ++- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build-scripts/

[tor-commits] [torbrowser/maint-2.2] Move mingw location to the internal path, so that we are not dependant on the install locations.

2012-06-05 Thread erinn
commit 360cb483036ab6ea0728f83f897e546f5bcbafaf Author: Shondoit Walker Date: Sat May 5 00:13:49 2012 +0200 Move mingw location to the internal path, so that we are not dependant on the install locations. --- build-scripts/windows.mk |2 +- 1 files changed, 1 insertions(+), 1 deletion

[tor-commits] [tor/master] today is the day for 0.2.3.16-alpha

2012-06-05 Thread arma
commit 80b2308aec444f0da967ba1c2c66cb44a79bea5b Author: Roger Dingledine Date: Tue Jun 5 12:14:57 2012 -0400 today is the day for 0.2.3.16-alpha --- ChangeLog|2 +- configure.in |2 +- contrib/tor-mingw.nsi.in |2 +- src/win32/orconfig.h |2 +

[tor-commits] [tor/master] start folding in the changes files

2012-06-05 Thread arma
commit 85a98b058c06c21b2e9b8dfa2f46671fc29a92e3 Author: Roger Dingledine Date: Tue Jun 5 12:05:31 2012 -0400 start folding in the changes files --- ChangeLog | 226 changes/bug1938|4 - changes/bug2297-relat

[tor-commits] [tor/master] Merge branch 'bug5603'

2012-06-05 Thread nickm
commit 7b2afb61b21d09bc3dfc015a18538bf2826e805c Merge: d09a3ec 7cad2e7 Author: Nick Mathewson Date: Tue Jun 5 11:47:34 2012 -0400 Merge branch 'bug5603' changes/bug5603 |9 ++ src/or/circuitbuild.c | 70 ++--- 2 files changed, 75

[tor-commits] [tor/master] Changes file for bug 5603

2012-06-05 Thread nickm
commit 7cad2e73481bdfa04c3d4a69f026784386440f0b Author: Nick Mathewson Date: Tue Jun 5 11:47:16 2012 -0400 Changes file for bug 5603 --- changes/bug5603 |9 + 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/changes/bug5603 b/changes/bug5603 new file mode 100644 i

[tor-commits] [tor/master] Improve conflict resolution when adding new bridges.

2012-06-05 Thread nickm
commit 1e95a4a1f6d074e5f5f0033f596dd5ee66eea58a Author: George Kadianakis Date: Sun Jun 3 00:21:49 2012 +0300 Improve conflict resolution when adding new bridges. --- src/or/circuitbuild.c | 88 ++-- 1 files changed, 84 insertions(+), 4 deletio

[tor-commits] [tor/master] Minor changes to bug5603

2012-06-05 Thread nickm
commit 64167e1772b62a06fe8853b84c3cd027abcc7f74 Author: Nick Mathewson Date: Tue Jun 5 11:39:31 2012 -0400 Minor changes to bug5603 * Minor stylistic changes to comments and doxygen * Use strcmp_opt; it already exists. * Tighten bridge_has_digest implementation a litt

[tor-commits] [tor/master] Merge remote-tracking branch 'public/getfilesize_64'

2012-06-05 Thread nickm
commit d09a3ecd01330e2ec5da942a0469a37416da75ed Merge: b482c87 e7d3493 Author: Nick Mathewson Date: Tue Jun 5 11:10:42 2012 -0400 Merge remote-tracking branch 'public/getfilesize_64' Conflicts: src/common/compat.c The getfilesize change conflicted with the removal

[tor-commits] [tor/master] Fix some mingw build warnings

2012-06-05 Thread nickm
commit b482c870ca3d70bc5611b8eb447ebbe3418bf3a9 Author: Nick Mathewson Date: Tue Jun 5 11:06:26 2012 -0400 Fix some mingw build warnings These include: - Having a weird in_addr that can't be initialized with {0} - Needing INVALID_HANDLE_VALUE instead of -1 for file ha

[tor-commits] [tor/master] Use GetFileSize correctly on win32

2012-06-05 Thread nickm
commit e7d34935fb3050065cf0d8350b5d75f72c1fe6c4 Author: Nick Mathewson Date: Thu May 24 10:19:41 2012 -0400 Use GetFileSize correctly on win32 (Use its second parameter to find the high 32 bits of the file size; check its return value for error conditions.) --- changes/getfile

[tor-commits] [tor/master] Revert "Disable (Cell, DirReq, Entry, ExitPort)Statistics on bridges"

2012-06-05 Thread nickm
commit 2468a1bd2c3a989c4225897e58b5bf09ac08ba61 Author: Nick Mathewson Date: Tue Jun 5 10:47:05 2012 -0400 Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges" This reverts commit 981e896dd2eaf69798bb503c271306ee779dd6d2. Apparently Karsten still needs DirReq

[tor-commits] [tor/master] Downgrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr

2012-06-05 Thread nickm
commit 38642a9369faa3e511c32a59a52536fd396de45a Author: Nick Mathewson Date: Tue Jun 5 10:36:34 2012 -0400 Downgrade tor_assert(0) to tor_fragile_assert() in windows stub create_unix_sockaddr --- src/or/connection.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a

[tor-commits] [tor/master] Merge remote-tracking branch 'public/format_doubles'

2012-06-05 Thread nickm
commit b4bd4964eba5b0dae811a5c28c664b8f78a0672c Merge: 981e896 0bec9f3 Author: Nick Mathewson Date: Tue Jun 5 10:30:50 2012 -0400 Merge remote-tracking branch 'public/format_doubles' Conflicts: src/or/geoip.c changes/bug3894_fmt_doubles |4 src/or/dirserv.c

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3894'

2012-06-05 Thread nickm
commit 7f45ea5c41bd076accd3720c021e6d3b512fb2b2 Merge: b4bd496 f35271b Author: Nick Mathewson Date: Tue Jun 5 10:31:00 2012 -0400 Merge remote-tracking branch 'public/bug3894' changes/bug3894_more |4 configure.in |2 ++ src/common/compat.h |3 +++ src/common/tor

[tor-commits] [tor/master] Fix some more FreeBSD4 issues (based on a patch from grarpamp)

2012-06-05 Thread nickm
commit f35271bf3eceadd03bff26d34c1d020892d6c6f0 Author: Nick Mathewson Date: Wed May 16 14:31:36 2012 -0400 Fix some more FreeBSD4 issues (based on a patch from grarpamp) Apparently, freebsd 4 doesn't like malloc.h, needs sys/param.h for MIN/MAX, and doesn't have a SIZE_MAX.

[tor-commits] [tor/master] Use %f, not %lf when formatting doubles

2012-06-05 Thread nickm
commit 0bec9f320b81a85ba3596e9780b1cf7c770dfb31 Author: Nick Mathewson Date: Wed May 16 14:26:35 2012 -0400 Use %f, not %lf when formatting doubles %f is correct; %lf is only needed with scanf. Apparently, on some old BSDs, %lf is deprecated. Didn't we do this before?

[tor-commits] [tor/master] Disable (Cell, DirReq, Entry, ExitPort)Statistics on bridges

2012-06-05 Thread nickm
commit 981e896dd2eaf69798bb503c271306ee779dd6d2 Author: Nick Mathewson Date: Tue Jun 5 10:25:50 2012 -0400 Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges These stats are currently discarded, but we might as well hard-disable them on bridges, to be clean. Fix

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug4657'

2012-06-05 Thread nickm
commit 1ce0c5eba93d2ac48609efc327e6dc1d3a8de981 Merge: c19a2ff 281a5e4 Author: Nick Mathewson Date: Tue Jun 5 10:20:44 2012 -0400 Merge remote-tracking branch 'public/bug4657' Conflicts: src/or/router.c changes/bug4657 |4 src/or/config.c |6 ++ src/or/ro

[tor-commits] [tor/master] Warn and ignore the MyFamily setting if BridgeRelay is also set

2012-06-05 Thread nickm
commit 281a5e4670bfd4d687f58cf666a4d097e35e Author: Nick Mathewson Date: Thu May 24 12:39:26 2012 -0400 Warn and ignore the MyFamily setting if BridgeRelay is also set Roger explains at http://archives.seul.org/tor/talk/Nov-2011/msg00209.html : "If you list you

[tor-commits] [tor/master] Report EADDRNOTAVAIL and EADDRINUSE as RESOURCELIMIT

2012-06-05 Thread nickm
commit 2b6e91c2ee4f89c0ee31c83c3a5e5414fd2b3d40 Author: Nick Mathewson Date: Wed May 16 12:31:45 2012 -0400 Report EADDRNOTAVAIL and EADDRINUSE as RESOURCELIMIT These errors usually mean address exhaustion; reporting them as such lets clients adjust their load to try other exit

[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug4710'

2012-06-05 Thread nickm
commit c19a2ff6913111d69f2b541194ae188dc354fc54 Merge: 20d6f78 2b6e91c Author: Nick Mathewson Date: Tue Jun 5 10:16:28 2012 -0400 Merge remote-tracking branch 'public/bug4710' changes/bug4710 |5 + src/or/reasons.c |2 ++ 2 files changed, 7 insertions(+), 0 deletions(-)

[tor-commits] r25672: {website} fix another broken link on the download page, this time wher (website/trunk/download/en)

2012-06-05 Thread Roger Dingledine
Author: arma Date: 2012-06-05 13:43:49 + (Tue, 05 Jun 2012) New Revision: 25672 Modified: website/trunk/download/en/download.wml Log: fix another broken link on the download page, this time where we had patched the wml directly, rather than our versions file. :/ Modified: website/trunk/do

[tor-commits] r25671: {website} unless i am mistaken, we never use these three tags. even th (website/trunk/include)

2012-06-05 Thread Roger Dingledine
Author: arma Date: 2012-06-05 13:41:53 + (Tue, 05 Jun 2012) New Revision: 25671 Modified: website/trunk/include/versions.wmi Log: unless i am mistaken, we never use these three tags. even though we've been updating them. Modified: website/trunk/include/versions.wmi ===

[tor-commits] r25670: {website} remove the stray "-1" suffix that was breaking download link (website/trunk/include)

2012-06-05 Thread Roger Dingledine
Author: arma Date: 2012-06-05 13:35:27 + (Tue, 05 Jun 2012) New Revision: 25670 Modified: website/trunk/include/versions.wmi Log: remove the stray "-1" suffix that was breaking download links for most vidalia packages Modified: website/trunk/include/versions.wmi ==

[tor-commits] [translation/gettor] Update translations for gettor

2012-06-05 Thread translation
commit ffcb96b10533033f6f2de01873c8fc96c5892ebb Author: Translation commit bot Date: Tue Jun 5 09:45:03 2012 + Update translations for gettor --- ko_KR/gettor.po | 453 +++ 1 files changed, 453 insertions(+), 0 deletions(-) diff --g