[tor-commits] [bridgedb/master] Add utility module with safe logging functions and new SAFELOGGING config option

2013-07-09 Thread asn
commit 131e0f9b43002ab22e779c886d3a0953390ddded Author: Matthew Finkel matthew.fin...@gmail.com Date: Tue Jul 9 01:33:13 2013 + Add utility module with safe logging functions and new SAFELOGGING config option --- bridgedb.conf|3 +++ lib/bridgedb/Util.py | 12

[tor-commits] [bridgedb/master] Log more info during startup and after SIGHUP

2013-07-09 Thread asn
commit 06b0bc1b3612ab1960c7c4b6fbaedc048e1f51d3 Author: Matthew Finkel matthew.fin...@gmail.com Date: Tue Jul 9 11:48:02 2013 + Log more info during startup and after SIGHUP --- lib/bridgedb/Main.py | 43 --- 1 file changed, 36 insertions(+), 7

[tor-commits] [bridgedb/master] Scrub client information before logging

2013-07-09 Thread asn
commit c0ee0d54aaceb6aa0b955a2223e35a27b20e7e60 Author: Matthew Finkel matthew.fin...@gmail.com Date: Tue Jul 9 01:33:59 2013 + Scrub client information before logging --- lib/bridgedb/Dist.py| 16 +--- lib/bridgedb/EmailServer.py | 13 +++--

[tor-commits] [bridgedb/master] Don't forget to close the extra-info descriptor file

2013-07-09 Thread asn
commit a05794837d5def058d6208f36b63f116fc7a921f Author: Matthew Finkel matthew.fin...@gmail.com Date: Tue Jul 9 11:48:15 2013 + Don't forget to close the extra-info descriptor file --- lib/bridgedb/Main.py |1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/Main.py

[tor-commits] [bridgedb/master] Moar logging in parsing codez

2013-07-09 Thread asn
commit 0e83b6e0750376cf7041143b3bfb20910428f5d5 Author: Matthew Finkel matthew.fin...@gmail.com Date: Tue Jul 9 01:13:27 2013 + Moar logging in parsing codez --- lib/bridgedb/Bridges.py | 28 ++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git

[tor-commits] [bridgedb/master] HMAC isn't a logger, don't pass it args as if it is

2013-07-11 Thread asn
commit 78ba1628bdc405d0f6b5698b78e2b682d43928d1 Author: Matthew Finkel matthew.fin...@gmail.com Date: Thu Jul 11 10:57:43 2013 + HMAC isn't a logger, don't pass it args as if it is Bug fix on #9237. Bug introduced in c0ee0d54 --- lib/bridgedb/Dist.py |2 +- 1 file changed,

[tor-commits] [bridgedb/master] More bridge pool assignment debug output

2013-07-11 Thread asn
commit 0bc21e19779e1e139aebf814fa067c581ff1e1ad Author: Matthew Finkel matthew.fin...@gmail.com Date: Wed Jul 10 19:30:20 2013 + More bridge pool assignment debug output Also more readable descriptor parser debug logging --- lib/bridgedb/Bridges.py | 37

[tor-commits] [bridgedb/master] Update the README with deployment instructions.

2013-07-23 Thread asn
commit 8115774d7e2c2729a231f33200b91d8017cdc717 Author: Isis Lovecruft i...@torproject.org Date: Fri Jul 5 01:40:49 2013 + Update the README with deployment instructions. * CHANGED the README to markdown format. * ADD user friendly instructions at the top, so that anyone

[tor-commits] [bridgedb/master] Remove --install-prefix settings from setup.cfg.

2013-07-23 Thread asn
commit 567a030d2cdbacf6be5b8e4632b2cb2e2ba8db83 Author: Isis Lovecruft i...@torproject.org Date: Fri Jul 5 01:44:41 2013 + Remove --install-prefix settings from setup.cfg. * The default instructions in the README now say to use a virtualenv, and these are not compatible

[tor-commits] [bridgedb/master] Update requirements.txt file.

2013-07-23 Thread asn
commit 10cdd269ddd7bdf1154cd0210ea64d16f86bb0a9 Author: Isis Lovecruft i...@torproject.org Date: Thu Jul 4 22:48:29 2013 + Update requirements.txt file. * ADD recaptcha package (this is needed in addition to recaptcha-client). * CHANGE BeautifulSoup, Babel, Mako, and

[tor-commits] [bridgedb/master] Add bridgedb key/db/descriptor/logs/etc files to .gitignore.

2013-07-23 Thread asn
commit f5545802d0ab4beb8464f3f3a9f0ec4f2128858d Author: Isis Lovecruft i...@torproject.org Date: Thu Jul 4 22:45:35 2013 + Add bridgedb key/db/descriptor/logs/etc files to .gitignore. --- .gitignore | 26 ++ 1 file changed, 26 insertions(+) diff --git

[tor-commits] [bridgedb/master] Add standard Python exclusions to the .gitignore.

2013-07-23 Thread asn
commit 0ad56883868c76e20f0b92b5c5445352cf7cfb46 Author: Isis Lovecruft i...@torproject.org Date: Thu Jul 4 22:32:13 2013 + Add standard Python exclusions to the .gitignore. --- .gitignore | 50 +++--- 1 file changed, 43 insertions(+), 7

[tor-commits] [obfsproxy/master] Don't set bufferevent callbacks before forming the circuit.

2012-03-28 Thread asn
commit 4b754df88f8d658b4731ce93f2fcafcc34b72244 Author: George Kadianakis desnac...@riseup.net Date: Sat Mar 17 16:01:22 2012 -0700 Don't set bufferevent callbacks before forming the circuit. Achieve that by splitting the circuit creation into three parts: First, create the

[tor-commits] [obfsproxy/master] Move connection-building code around.

2012-03-28 Thread asn
commit 292b9ac875a44966d74c89cf6f2deac18310f2e5 Author: George Kadianakis desnac...@riseup.net Date: Mon Mar 19 16:48:10 2012 -0700 Move connection-building code around. In open_outbound{,_hostname}(), move the connection building part to a new function called conn_connect().

[tor-commits] [obfsproxy/master] Don't poke connections or circuits after connect_hostname().

2012-03-28 Thread asn
commit 70e6947c81e7c0f42c94e837fdabec271b876567 Author: George Kadianakis desnac...@riseup.net Date: Mon Mar 19 17:10:06 2012 -0700 Don't poke connections or circuits after connect_hostname(). bufferevent_socket_connect_hostname() might fail immediately, and take the whole

[tor-commits] [obfsproxy/master] Update changelog for #5156.

2012-03-28 Thread asn
commit fb132ee04e8480be31c3c17aba4ff9eb27821be0 Author: George Kadianakis desnac...@riseup.net Date: Sat Mar 17 16:29:33 2012 -0700 Update changelog for #5156. --- ChangeLog |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Do the release ritual for 0.1.3.

2012-04-03 Thread asn
commit 8cf684e052cf290ee2c7fcf8290d3f4cb3cf5c5d Author: George Kadianakis desnac...@riseup.net Date: Tue Apr 3 17:48:14 2012 +0200 Do the release ritual for 0.1.3. 0.1.2 was skipped since I tagged without doing the release ritual. Still getting used to this... --- ChangeLog

[tor-commits] [obfsproxy/master] Fix '--version' when called outside of a git repository.

2012-04-12 Thread asn
commit 8b53ef32f626229db8c4ac860733f75b00d66112 Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 9 16:53:19 2012 +0200 Fix '--version' when called outside of a git repository. Also, have '--version' output the release name and not just the git hash. --- ChangeLog

[tor-commits] [obfsproxy/master] Merge branch 'bug5586'

2012-04-17 Thread asn
commit 29be6074b338411fe7dc17534ebabe202f3a9ef9 Merge: 840d6cf 3d77ba8 Author: George Kadianakis desnac...@riseup.net Date: Tue Apr 17 15:31:34 2012 +0200 Merge branch 'bug5586' Conflicts: ChangeLog ChangeLog |2 ++ src/network.c |1 - 2 files changed, 2

[tor-commits] [obfsproxy/master] Don't enable bufferevent reads/writes before connecting.

2012-04-17 Thread asn
commit 3d77ba8fdac6ba252d9501fce0021cfdec4ce8ae Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 9 17:04:01 2012 +0200 Don't enable bufferevent reads/writes before connecting. This caused an assertion failure when we connected to a SOCKS destination. We didn't call

[tor-commits] [obfsproxy/master] Avoid segfault on resolve_address_port(NULL)

2012-04-17 Thread asn
commit f9d55f065c0348f8f39a96a4844184928ec7019a Author: Nick Mathewson ni...@torproject.org Date: Wed Feb 15 12:22:52 2012 -0500 Avoid segfault on resolve_address_port(NULL) --- src/util.c |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/util.c

[tor-commits] [obfsproxy/master] Fix obfs2 argument parsing.

2012-04-17 Thread asn
commit ee63d3fa345ed7230d229433416e75d4c43d7436 Author: George Kadianakis desnac...@riseup.net Date: Wed Apr 11 22:31:30 2012 +0200 Fix obfs2 argument parsing. Keep a count of how many command line arguments we have left, so that we know when to stop parsing. --- ChangeLog

[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'nickm/bug5141'

2012-04-17 Thread asn
commit 5d9ac64d15ca373f2a295dee38bba5691fd53a46 Merge: 29be607 f9d55f0 Author: George Kadianakis desnac...@riseup.net Date: Tue Apr 17 15:46:27 2012 +0200 Merge remote-tracking branch 'nickm/bug5141' src/util.c |7 ++- 1 files changed, 6 insertions(+), 1 deletions(-)

[tor-commits] [obfsproxy/master] Indent obfs2 argument parsing.

2012-04-17 Thread asn
commit fd2e4fca7a267b3c1023db5f808f53bc35f3948d Author: George Kadianakis desnac...@riseup.net Date: Wed Apr 11 22:00:38 2012 +0200 Indent obfs2 argument parsing. --- src/protocols/obfs2.c | 96 1 files changed, 48 insertions(+), 48

[tor-commits] [obfsproxy/master] Merge branch 'bug5141'

2012-04-17 Thread asn
commit 60451a4aa8fdabf720216993b358bc5929bfd6e9 Merge: 5d9ac64 ee63d3f Author: George Kadianakis desnac...@riseup.net Date: Tue Apr 17 15:46:45 2012 +0200 Merge branch 'bug5141' Conflicts: ChangeLog ChangeLog |2 + src/protocols/obfs2.c | 107

[tor-commits] [obfsproxy/master] Produce an error if pkg-config isn't found.

2012-04-26 Thread asn
commit 5830a400052cfbb397d67aa2149a564af9f2df26 Author: Rob Savoye r...@welcomehome.org Date: Thu Apr 26 08:40:57 2012 -0600 Produce an error if pkg-config isn't found. --- m4/pkg.m4 |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/m4/pkg.m4 b/m4/pkg.m4 index

[tor-commits] [obfsproxy/master] Produce an error if pkg-config's version is old.

2012-04-26 Thread asn
commit e0e53de4f5ea91762fd810f2c5755f0c22e578ef Author: George Kadianakis desnac...@riseup.net Date: Thu Apr 26 18:05:19 2012 +0300 Produce an error if pkg-config's version is old. --- m4/pkg.m4 |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/pkg.m4

[tor-commits] [obfsproxy/master] Revert Produce an error if pkg-config isn't found.

2012-05-01 Thread asn
commit eaf42ad6177767e1cfcacbe87c3d2b4089bc79ca Author: George Kadianakis desnac...@riseup.net Date: Tue May 1 20:54:52 2012 +0300 Revert Produce an error if pkg-config isn't found. This reverts commit 5830a400052cfbb397d67aa2149a564af9f2df26. --- m4/pkg.m4 |2 -- 1 files

[tor-commits] [obfsproxy/master] Revert Produce an error if pkg-config's version is old.

2012-05-01 Thread asn
commit 9e9573bdf6c4220d3c0180143ed00594cd7e8bf4 Author: George Kadianakis desnac...@riseup.net Date: Tue May 1 20:46:19 2012 +0300 Revert Produce an error if pkg-config's version is old. This reverts commit e0e53de4f5ea91762fd810f2c5755f0c22e578ef, since it seems that adding

[tor-commits] [obfsproxy/master] Don't use compiler flags that break the build

2012-05-01 Thread asn
commit 0feee69e1b2498ebe77f8780191ab1026eafcdec Author: Sebastian Hahn sebast...@torproject.org Date: Wed Apr 25 16:15:25 2012 +0200 Don't use compiler flags that break the build --- ChangeLog|3 +++ m4/ax_build_hardening.m4 | 21 +++-- 2 files

[tor-commits] [obfsproxy/master] Merge remote-tracking branch 'seb/bug5665'

2012-05-01 Thread asn
commit 70c522aaa6fa4fdbc335d4c7422924249a278bab Merge: eaf42ad 0feee69 Author: George Kadianakis desnac...@riseup.net Date: Wed May 2 04:38:21 2012 +0300 Merge remote-tracking branch 'seb/bug5665' ChangeLog|3 +++ m4/ax_build_hardening.m4 | 21 +++--

[tor-commits] [obfsproxy/master] Do the release ritual for 0.1.4.

2012-05-01 Thread asn
commit 94ebc4c3edf1e3e5f313444e59981ac557578df5 Author: George Kadianakis desnac...@riseup.net Date: Tue May 1 22:38:18 2012 +0300 Do the release ritual for 0.1.4. --- ChangeLog|2 +- configure.ac |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog

[tor-commits] [obfsproxy/master] Update changelog for #5311.

2012-03-05 Thread asn
commit 31b8fb394144bea143cc6baa1f945617c17f5636 Author: George Kadianakis desnac...@riseup.net Date: Mon Mar 5 16:58:32 2012 -0800 Update changelog for #5311. --- ChangeLog |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Minor nitpick edit of the manpage: the proper URL ends with a slash.

2012-03-05 Thread asn
commit 8d8e03b8f818bf4337ed963a8a87443589017246 Author: Peter Palfrader pe...@palfrader.org Date: Mon Mar 5 21:54:40 2012 +0100 Minor nitpick edit of the manpage: the proper URL ends with a slash. --- doc/obfsproxy.1 |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git

[tor-commits] [obfsproxy/master] Update changelog for #5312.

2012-03-05 Thread asn
commit a1ea237f723cf92f45f77122148fd667a813e2e9 Author: George Kadianakis desnac...@riseup.net Date: Mon Mar 5 17:25:46 2012 -0800 Update changelog for #5312. --- ChangeLog |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Ship with LICENSE and Doxyfile, explicitly mention ChangeLog and README

2012-03-05 Thread asn
commit f1a2e5adb6d21ea6588e8809f272aa1eae91a871 Author: Peter Palfrader pe...@palfrader.org Date: Mon Mar 5 22:15:01 2012 +0100 Ship with LICENSE and Doxyfile, explicitly mention ChangeLog and README --- Makefile.am |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git

[tor-commits] [obfsproxy/master] Fix building doxygen outside the source tree

2012-03-06 Thread asn
commit 561f3419d5fc3e421c13b87bff2f19cdd79216a7 Author: Peter Palfrader pe...@palfrader.org Date: Mon Mar 5 22:17:58 2012 +0100 Fix building doxygen outside the source tree --- Makefile.am |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am

[tor-commits] [obfsproxy/master] Update changelog for #5315.

2012-03-06 Thread asn
commit ed5840e6477ce3e1688e61ee760bab43e4fde761 Author: George Kadianakis desnac...@riseup.net Date: Tue Mar 6 10:39:42 2012 -0800 Update changelog for #5315. --- ChangeLog |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Update license information for src/sha256.h.

2012-03-09 Thread asn
commit 05c5a804424de78287b1bd27ae14eda11b6df642 Author: George Kadianakis desnac...@riseup.net Date: Tue Mar 6 12:55:19 2012 -0800 Update license information for src/sha256.h. --- LICENSE |5 +++-- src/sha256.h |5 + 2 files changed, 8 insertions(+), 2 deletions(-) diff

[tor-commits] [obfsproxy/master] Update changelog for #5310.

2012-03-09 Thread asn
commit 754e669693a139908c34cc6616026e935cc54601 Author: George Kadianakis desnac...@riseup.net Date: Fri Mar 9 01:55:45 2012 -0800 Update changelog for #5310. --- ChangeLog |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Makefile.am: Fix sed input

2012-03-09 Thread asn
commit 7abe6b72226b4462241d58324d75504c29ce9ba9 Author: Peter Palfrader pe...@palfrader.org Date: Mon Mar 5 21:36:17 2012 +0100 Makefile.am: Fix sed input Fix the sed command that broke building the python test in a build-tree, since it was specifying a path to the input that

[tor-commits] [obfsproxy/master] Update README compilation instructions.

2012-03-09 Thread asn
commit 4aeface16c472632eecd74d1877234eb400c7d39 Author: George Kadianakis desnac...@riseup.net Date: Fri Mar 9 00:13:43 2012 -0800 Update README compilation instructions. --- ChangeLog |1 + README|6 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git

[tor-commits] [obfsproxy/master] Merge branch 'bug5313'

2012-03-09 Thread asn
commit 844a1a38cc6f84f71542003bf10e273f978f2f5e Merge: 754e669 4aeface Author: George Kadianakis desnac...@riseup.net Date: Fri Mar 9 16:22:57 2012 -0800 Merge branch 'bug5313' Conflicts: ChangeLog ChangeLog |1 + README|6 +- 2 files changed, 6

[tor-commits] [obfsproxy/master] basic AppArmor obfsproxy profile

2012-03-09 Thread asn
commit f8a71be3206b56dc832a7496adee5c10caabea54 Author: Jacob Appelbaum ja...@appelbaum.net Date: Mon Feb 13 18:28:12 2012 -0500 basic AppArmor obfsproxy profile --- misc/obfsproxy.apparmor | 33 + 1 files changed, 33 insertions(+), 0 deletions(-) diff

[tor-commits] [obfsproxy/master] add GPL license for m4 macros

2012-03-09 Thread asn
commit ba63523e2c119fce02e77cac1ca2af420c37184a Author: Jacob Appelbaum ja...@appelbaum.net Date: Thu Mar 8 16:05:07 2012 -0800 add GPL license for m4 macros --- LICENSE | 281 +++ 1 files changed, 281 insertions(+), 0

[tor-commits] [obfsproxy/master] Add check for gcc and ld hardening flags.

2012-03-09 Thread asn
commit 0e69ae88923133dca88f9818671e65957d9f244c Author: Jacob Appelbaum ja...@appelbaum.net Date: Mon Feb 13 17:43:01 2012 -0500 Add check for gcc and ld hardening flags. This adds a new one shot automake macro AX_ENABLE_HARDENING and it attempts to add the various security

[tor-commits] [obfsproxy/master] Update changelog for #5131.

2012-03-09 Thread asn
commit a52321b57b896d8f6aaf2fa77b8d58511c7f4844 Author: George Kadianakis desnac...@riseup.net Date: Fri Mar 9 22:13:33 2012 -0800 Update changelog for #5131. --- ChangeLog |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Do the release ritual for 0.1.1.

2012-03-09 Thread asn
commit 3f1006aaa122441fa48ef2457f0c1f1920718e41 Author: George Kadianakis desnac...@riseup.net Date: Fri Mar 9 23:20:19 2012 -0800 Do the release ritual for 0.1.1. --- ChangeLog|2 +- configure.ac |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog

[tor-commits] [obfsproxy/master] Fix a name in LICENSE.

2012-03-11 Thread asn
commit 0a5200eca36e53e5ce4205d4916522f38405428c Author: George Kadianakis desnac...@riseup.net Date: Sun Mar 11 18:36:19 2012 -0700 Fix a name in LICENSE. --- LICENSE |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/LICENSE b/LICENSE index 8f57d3d..0d416ca 100644

[tor-commits] [obfsproxy/master] obfsproxify tor_asprintf() and friends

2012-03-19 Thread asn
commit dfbe3e36a516191a18fd55540d88dee344181ac4 Author: George Kadianakis desnac...@riseup.net Date: Wed Feb 22 11:39:55 2012 -0800 obfsproxify tor_asprintf() and friends s/tor_snprintf/obfs_snprintf/g s/tor_vasprintf/obfs_vasprintf/g s/tor_asprintf/obfs_asprintf/g

[tor-commits] [obfsproxy/master] Add obfs_asprintf() unit tests.

2012-03-19 Thread asn
commit 48c54ccec2ab50407fd4ee40f618c90ff23e4c1f Author: George Kadianakis desnac...@riseup.net Date: Wed Feb 22 12:21:49 2012 -0800 Add obfs_asprintf() unit tests. Take tor_asprintf() unit tests off tor.git:src/tests/test_util.c:test_util_asprintf(). Replace

[tor-commits] [obfsproxy/master] Merge branch 'bug4921'

2012-03-19 Thread asn
commit 1415cfd325af85d4922c2a69ac395432887a3636 Merge: 0a5200e b9a3fe1 Author: George Kadianakis desnac...@riseup.net Date: Mon Mar 19 12:49:24 2012 -0700 Merge branch 'bug4921' Makefile.am |3 +- src/network.c| 22 ++- src/test/unittest.c |

[tor-commits] [obfsproxy/master] Copy-paste tor.git:src/common/compat.c:tor_asprintf() in.

2012-03-19 Thread asn
commit db4053efff50c7f0813cab4e7b7e11b06ead724e Author: George Kadianakis desnac...@riseup.net Date: Wed Feb 22 10:45:27 2012 -0800 Copy-paste tor.git:src/common/compat.c:tor_asprintf() in. We also need its tor_vasprintf() dependency. --- src/util.c | 94

[tor-commits] [obfsproxy/master] Change an instance of 'malloc(); snprintf(); ' to use 'obfs_asprintf()'.

2012-03-19 Thread asn
commit b9a3fe1012815d7040cbd766fa463c2599338bc7 Author: George Kadianakis desnac...@riseup.net Date: Wed Feb 22 12:51:13 2012 -0800 Change an instance of 'malloc();snprintf();' to use 'obfs_asprintf()'. --- src/network.c | 22 -- 1 files changed, 4 insertions(+), 18

[tor-commits] [obfsproxy/master] Implement 'make-version'.

2012-03-19 Thread asn
commit d8ef5b5cb200e633db146511033535d178b63659 Author: George Kadianakis desnac...@riseup.net Date: Wed Feb 22 13:59:40 2012 -0800 Implement 'make-version'. --- Makefile.am |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index

[tor-commits] [obfsproxy/master] Implement --version and put git revision on top of log.

2012-03-19 Thread asn
commit 4f3d208352cada4bd3f31696e1d19f5061ed2692 Author: George Kadianakis desnac...@riseup.net Date: Mon Mar 19 12:55:34 2012 -0700 Implement --version and put git revision on top of log. Also, implement --help. --- .gitignore |1 + ChangeLog |7 +++ Makefile.am |

[tor-commits] [obfsproxy/master] Trivial layout change in Changelog.

2012-03-19 Thread asn
commit d34089686511346da413f5fb35a86a3b2541b1ee Author: George Kadianakis desnac...@riseup.net Date: Mon Mar 19 13:16:52 2012 -0700 Trivial layout change in Changelog. --- ChangeLog |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Proxy support: Ensure we have txsocksx and a recent enough Twisted.

2014-04-25 Thread asn
commit 1106ec14c98207cf8cfdb1e660efbaee4293fe1d Author: George Kadianakis desnac...@riseup.net Date: Fri Apr 25 20:11:23 2014 +0100 Proxy support: Ensure we have txsocksx and a recent enough Twisted. From now on, obfsproxy when configured to connect to a proxy (either using

[tor-commits] [obfsproxy/master] Make txsocksx an optional dependency.

2014-04-25 Thread asn
commit a2cd2dfa38ca021eefa82bf3ee47702b68df1624 Author: George Kadianakis desnac...@riseup.net Date: Fri Apr 25 20:20:11 2014 +0100 Make txsocksx an optional dependency. Server-side obfsproxy does not need txsocksx. --- obfsproxy/network/network.py | 10 +- setup.py

[tor-commits] [obfsproxy/master] Add a compatibility layer for Twisted's UnsupportedAddressFamily.

2014-04-25 Thread asn
commit befd673af04f1b7d1d7d4a3c92a824b61084b4fe Author: George Kadianakis desnac...@riseup.net Date: Fri Apr 25 20:21:39 2014 +0100 Add a compatibility layer for Twisted's UnsupportedAddressFamily. twisted.internet.error.UnsupportedAddressFamily was added in twisted-12.1.0.

[tor-commits] [obfsproxy/master] Make sure that AES-CTR counter of obfs{2, 3} won't overflow.

2014-04-26 Thread asn
commit 7b562f53fb02f930b3c43f1571a90f6634df0664 Author: George Kadianakis desnac...@riseup.net Date: Sat Apr 26 19:14:51 2014 +0100 Make sure that AES-CTR counter of obfs{2,3} won't overflow. --- ChangeLog |4 obfsproxy/common/aes.py | 11 ---

[tor-commits] [obfsproxy/master] Do the release ritual for obfsproxy-0.2.9.

2014-05-01 Thread asn
commit c977bab005dc6e3a07af5f075b5c28289dcadd82 Author: George Kadianakis desnac...@riseup.net Date: Thu May 1 19:45:15 2014 +0100 Do the release ritual for obfsproxy-0.2.9. --- ChangeLog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [obfsproxy/master] Print ScrambleSuit disclaimer on startup.

2014-05-06 Thread asn
commit 0005192c52863f45c36709722cb3c7f237f9c375 Author: George Kadianakis desnac...@riseup.net Date: Tue May 6 14:15:15 2014 +0100 Print ScrambleSuit disclaimer on startup. instead of printing it for every new connection --- ChangeLog |4

[tor-commits] [obfsproxy/master] Don't do networking on connections that should be closed.

2014-05-08 Thread asn
commit 2ff160c0ad9258109d8c47eca162e7cd24e0f161 Author: George Kadianakis desnac...@riseup.net Date: Thu May 8 17:22:44 2014 +0100 Don't do networking on connections that should be closed. --- ChangeLog|2 ++ obfsproxy/network/extended_orport.py |3 +++

[tor-commits] [obfsproxy/master] Don't set transport circuit to None when closing a circuit.

2014-05-08 Thread asn
commit 8fdb64a2edf9e354136085dc2ce38dbb60457716 Author: George Kadianakis desnac...@riseup.net Date: Thu May 8 17:42:14 2014 +0100 Don't set transport circuit to None when closing a circuit. --- ChangeLog|2 ++ obfsproxy/network/network.py |1 - 2 files changed,

[tor-commits] [obfsproxy/master] Log pyptlib version on startup.

2014-05-10 Thread asn
commit ce1a9e68fd8c6da2221f388e0f09b4efc740c6b9 Author: John Giannelos johngianne...@gmail.com Date: Sat May 10 03:33:38 2014 +0300 Log pyptlib version on startup. --- obfsproxy/pyobfsproxy.py |8 1 file changed, 8 insertions(+) diff --git a/obfsproxy/pyobfsproxy.py

[tor-commits] [pyptlib/master] Add __version__ attribute in pyptlib package.

2014-05-10 Thread asn
', long_description='A python implementation of the Pluggable Transports for Circumvention specification for Tor', author='asn, Brandon Wiley', ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin

[tor-commits] [obfsproxy/master] Add a ChangeLog entry for #9878.

2014-05-10 Thread asn
commit 870c01d86134215bd7d0e3cf12c57bba94ab77ee Author: George Kadianakis desnac...@riseup.net Date: Sat May 10 20:13:00 2014 +0100 Add a ChangeLog entry for #9878. --- ChangeLog |1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 35fea5a..5cdbbda 100644 ---

[tor-commits] [obfsproxy/master] Do the release ritual for obfsproxy-0.2.10.

2014-06-05 Thread asn
commit c4762bb7b4ff90c471b8f549637fc224380c3f42 Author: George Kadianakis desnac...@riseup.net Date: Thu Jun 5 20:53:01 2014 +0100 Do the release ritual for obfsproxy-0.2.10. --- ChangeLog |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [torspec/master] Apply Yawning's pt-spec.txt improvements.

2014-07-10 Thread asn
commit c6c7404547e0e431232dd1674ff11023a2d6f6bf Author: George Kadianakis desnac...@riseup.net Date: Thu Jul 10 15:01:39 2014 +0300 Apply Yawning's pt-spec.txt improvements. --- pt-spec.txt | 298 +-- 1 file changed, 149

[tor-commits] [torspec/master] Replace the old pt-spec.txt with a new better one.

2014-07-10 Thread asn
commit 4dcd7e94f17c072e771119ec90d7cbce4a4788a4 Author: George Kadianakis desnac...@riseup.net Date: Wed Jul 9 15:28:45 2014 +0300 Replace the old pt-spec.txt with a new better one. --- pt-spec.txt | 603 +++ 1 file changed, 362

[tor-commits] [obfsproxy/master] Close connection if authentication fails.

2014-07-15 Thread asn
commit d16d4ade7504e83eef6e7f34c7da827a8a76c80a Author: Philipp Winter p...@torproject.org Date: Sat Mar 1 23:29:04 2014 +0100 Close connection if authentication fails. Adapt the server's behaviour to the spec change of commit 892846eb. When a server bootstraps for the first

[tor-commits] [obfsproxy/master] Fix problems in UniformDH spec.

2014-07-15 Thread asn
commit 18db73dd4d3f5a3a35019474dc5e53b1ef2f14c3 Author: Philipp Winter p...@torproject.org Date: Sun Mar 2 00:01:03 2014 +0100 Fix problems in UniformDH spec. 1. Fix a typo by changing X to Y. 2. Add M_C and M_S to the respective MAC function as they are also

[tor-commits] [obfsproxy/master] Add ChangeLog entry for #11092.

2014-07-15 Thread asn
commit 1367b4979c75001fbb91f972ef673d819e2f588a Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 14 14:47:20 2014 +0300 Add ChangeLog entry for #11092. Conflicts: ChangeLog --- ChangeLog |7 +++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog

[tor-commits] [obfsproxy/master] Elaborate on server's behaviour.

2014-07-15 Thread asn
commit 081e943987fad482786b1fa6fe3653672b7d Author: Philipp Winter p...@torproject.org Date: Sat Mar 1 22:14:18 2014 +0100 Elaborate on server's behaviour. In particular, discuss strategies which servers should implement if clients cannot authenticate. Otherwise, malicious

[tor-commits] [obfsproxy/master] Add scramblesuit unittests for the state module.

2014-07-15 Thread asn
commit 5333b1b650667409a7dc52cb646b2a822e3a2c80 Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 14 15:01:01 2014 +0300 Add scramblesuit unittests for the state module. --- obfsproxy/test/transports/test_scramblesuit.py | 47 1 file changed, 47

[tor-commits] [obfsproxy/master] Improve packet morphing algorithm.

2014-07-15 Thread asn
commit 0806a87f0183b3b74d20fe99184bdfb361d5f443 Author: Philipp Winter p...@torproject.org Date: Mon Mar 10 18:47:15 2014 +0100 Improve packet morphing algorithm. We only want to run the packet morphing algorithm when we really need it -- which is immediately before we send

[tor-commits] [obfsproxy/master] Make the server simply echo the client's epoch.

2014-07-15 Thread asn
commit 37fb7903588171ce7b73b7eb973590aff2a76736 Author: Philipp Winter p...@torproject.org Date: Tue Mar 4 20:34:16 2014 +0100 Make the server simply echo the client's epoch. That's only relevant for UniformDH. --- obfsproxy/transports/scramblesuit/uniformdh.py | 16

[tor-commits] [obfsproxy/master] Elaborate on protocol polymorphism.

2014-07-15 Thread asn
commit 685c0f689d75d83ce4defbc8c361d3ac2612f532 Author: Philipp Winter p...@torproject.org Date: Sun Mar 9 00:14:59 2014 +0100 Elaborate on protocol polymorphism. While the general idea is explained, there are no exact details. Implementations may use different (CS)PRNGs to

[tor-commits] [obfsproxy/master] Fix ticket handshake spec.

2014-07-15 Thread asn
commit 39aa6ffabe29ae305fbb1c36e78a9abb154e0894 Author: Philipp Winter p...@torproject.org Date: Sat Mar 8 17:40:35 2014 +0100 Fix ticket handshake spec. The first message makes use of the HMAC key which is derived from the master key. It does not use the master key itself.

[tor-commits] [obfsproxy/master] Add missing markers to HMACs.

2014-07-15 Thread asn
commit d68eb5caa5a85bdef2652cdebb6d3a832c184393 Author: Philipp Winter p...@torproject.org Date: Sun Mar 9 01:41:28 2014 +0100 Add missing markers to HMACs. Thanks to Yawning Angel for catching this. --- doc/scramblesuit/scramblesuit-spec.txt | 26 +- 1

[tor-commits] [obfsproxy/master] Add TicketTest unittest.

2014-07-15 Thread asn
commit b3fd09f6fc0326dd73ee2927fd70b6afa592738a Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 14 15:08:52 2014 +0300 Add TicketTest unittest. --- obfsproxy/test/transports/test_scramblesuit.py | 57 1 file changed, 57 insertions(+) diff --git

[tor-commits] [obfsproxy/master] When authenticating, also test epoch boundaries.

2014-07-15 Thread asn
commit fd4a91192ccab2cfda2c4b7887730a84152d5fa7 Author: Philipp Winter p...@torproject.org Date: Sat Mar 8 16:42:31 2014 +0100 When authenticating, also test epoch boundaries. On occasion, a client's or a server's epoch might already have increased whereas the epoch of the

[tor-commits] [obfsproxy/master] Add ChangeLog entry about scramblesuit spec improvements.

2014-07-15 Thread asn
commit 94089c08ddb9f3b050c2b3c3eeb80c451c5bb79d Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 14 15:10:35 2014 +0300 Add ChangeLog entry about scramblesuit spec improvements. Conflicts: ChangeLog --- ChangeLog |5 + 1 file changed, 5 insertions(+)

[tor-commits] [obfsproxy/master] Stop processing data after authentication failed.

2014-07-15 Thread asn
commit 1c02df654c45d25471200f9252bc133481e3ecdf Author: Philipp Winter p...@torproject.org Date: Mon Mar 3 23:59:27 2014 +0100 Stop processing data after authentication failed. If the client did not authenticate after MAX_HANDSHAKE_LENGTH bytes, authentication has failed. For

[tor-commits] [obfsproxy/master] Fix typo.

2014-07-15 Thread asn
commit 01eca9d516b2d4a8b47931d585f2b74417f058dd Author: Philipp Winter p...@torproject.org Date: Sat Mar 1 23:52:16 2014 +0100 Fix typo. The problem was pointed out by Yawning Angel in: https://bugs.torproject.org/10893#comment:3 --- doc/scramblesuit/scramblesuit-spec.txt |

[tor-commits] [obfsproxy/master] Add ChangeLog entry about scramblesuit's packetmorpher improvements.

2014-07-15 Thread asn
commit 29781d77f63279fcff84aba9240d6ff0b1ca1eb9 Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 14 15:15:22 2014 +0300 Add ChangeLog entry about scramblesuit's packetmorpher improvements. --- ChangeLog |2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog

[tor-commits] [obfsproxy/master] Increase closing threshold.

2014-07-15 Thread asn
commit ea2e71ffe07fbb1e8a307d4b33e9718d6b9b2576 Author: Philipp Winter p...@torproject.org Date: Tue Mar 4 00:04:36 2014 +0100 Increase closing threshold. Since we no longer process data after authentication has failed, we might as well increase the closing threshold. The

[tor-commits] [obfsproxy/master] Only search for mark in expected space.

2014-07-15 Thread asn
commit 7a374dd4446543339eee75421fbc1af73aa2c011 Author: Philipp Winter p...@torproject.org Date: Mon Mar 3 23:10:51 2014 +0100 Only search for mark in expected space. We know in which array slice the mark is expected. As a result, we don't have to look any further than that.

[tor-commits] [obfsproxy/master] Let the server echo the epoch.

2014-07-15 Thread asn
commit 33e7c8995d2b7b1ea317bd07d7833a8af6f1f6fe Author: Philipp Winter p...@torproject.org Date: Tue Mar 4 20:04:45 2014 +0100 Let the server echo the epoch. There's no need for the server to determine its own epoch. --- doc/scramblesuit/scramblesuit-spec.txt |6 -- 1 file

[tor-commits] [obfsproxy/master] Add and use const.MAX_HANDSHAKE_LENGTH.

2014-07-15 Thread asn
commit cdb79019280e79b0f508043d14da48f746d4 Author: Philipp Winter p...@torproject.org Date: Mon Mar 3 23:53:14 2014 +0100 Add and use const.MAX_HANDSHAKE_LENGTH. --- obfsproxy/transports/scramblesuit/const.py |6 ++ obfsproxy/transports/scramblesuit/state.py |7 ++- 2

[tor-commits] [obfsproxy/master] Add missing reference.

2014-07-15 Thread asn
commit d50a2cc615bdfef1122ccac12398397948b5312e Author: Philipp Winter p...@torproject.org Date: Sat Mar 8 17:38:12 2014 +0100 Add missing reference. --- doc/scramblesuit/scramblesuit-spec.txt |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [obfsproxy/master] Use more readable error messages.

2014-07-15 Thread asn
commit b498fe6feffda4a4d73112a099ecc9cdc134ffb6 Author: Philipp Winter p...@torproject.org Date: Sun Mar 9 00:45:27 2014 +0100 Use more readable error messages. To a user, it's not immediately clear that a given password was not well formed. The refactored error messages

[tor-commits] [obfsproxy/master] Add PacketMorpher unittests.

2014-07-15 Thread asn
commit 55fa261c83174b3e241241cf7b66ed3f629c7f88 Author: George Kadianakis desnac...@riseup.net Date: Mon Apr 14 15:14:14 2014 +0300 Add PacketMorpher unittests. --- obfsproxy/test/transports/test_scramblesuit.py | 36 1 file changed, 36 insertions(+) diff --git

[tor-commits] [obfsproxy/master] Add a ChangeLog entry for --password-file.

2014-07-15 Thread asn
commit 1a5c4e37fa5f0ae7ea57a6fa3574b07b9799661e Author: George Kadianakis desnac...@riseup.net Date: Tue Jul 15 15:31:39 2014 +0300 Add a ChangeLog entry for --password-file. --- ChangeLog |2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6615967..93c47fd

[tor-commits] [obfsproxy/master] Add --password-file for scramblesuit UniformDH password

2014-07-15 Thread asn
commit 0752d211de7001f4f1ee26979536ca469bca70ce Author: irregulator irregula...@riseup.net Date: Mon May 26 15:03:15 2014 +0300 Add --password-file for scramblesuit UniformDH password This argument permits to run obfsproxy in unmanaged mode and pass a file containing the

[tor-commits] [obfsproxy/master] When in external mode, only call setup() of the transports we are launching.

2014-07-16 Thread asn
commit 3d636a9660ffef71f1ec3d5ecbe4179098ebcbd7 Author: George Kadianakis desnac...@riseup.net Date: Fri May 9 15:50:57 2014 +0100 When in external mode, only call setup() of the transports we are launching. --- ChangeLog|2 ++ obfsproxy/pyobfsproxy.py |7 --- 2

[tor-commits] [obfsproxy/master] Catch some exceptions in scramblesuit's setup() and fail gracefully.

2014-07-16 Thread asn
commit 879181dd50980a329f345b5784fc37cf1abecf6a Author: George Kadianakis desnac...@riseup.net Date: Fri May 9 15:39:58 2014 +0100 Catch some exceptions in scramblesuit's setup() and fail gracefully. Conflicts: obfsproxy/transports/scramblesuit/scramblesuit.py ---

[tor-commits] [obfsproxy/master] Fix path joining in scramblesuit/state.py.

2014-07-16 Thread asn
commit ee185b8904a6463e925e27df7e18e3e64e77b9fc Author: George Kadianakis desnac...@riseup.net Date: Tue Jul 15 16:42:15 2014 +0300 Fix path joining in scramblesuit/state.py. --- obfsproxy/transports/scramblesuit/state.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[tor-commits] [obfsproxy/master] Remove a broken unittest.

2014-07-16 Thread asn
commit 7418e247a720de23131725629135234aba8a299a Author: George Kadianakis desnac...@riseup.net Date: Tue Jul 15 16:45:47 2014 +0300 Remove a broken unittest. --- obfsproxy/test/transports/test_scramblesuit.py |7 --- 1 file changed, 7 deletions(-) diff --git

  1   2   3   4   5   6   7   8   9   10   >