[tor-commits] [tor/master] Merge branch 'maint-0.2.3'

2012-09-13 Thread arma
commit 9ab3b332aec076451dd93d11ce7ce1fd81ff7294 Merge: abbde7b 909691f Author: Roger Dingledine Date: Fri Sep 14 02:41:13 2012 -0400 Merge branch 'maint-0.2.3' doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ___ tor-co

[tor-commits] [tor/master] Fix man page typo

2012-09-13 Thread arma
commit 909691f1ae9e2b8cd806cdf43b43f99b97c5c0f4 Author: Robert Ransom Date: Thu Sep 13 23:25:03 2012 -0700 Fix man page typo --- doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0bd9709..5aac054 100644 --- a/doc/tor

[tor-commits] [tor/maint-0.2.3] Fix man page typo

2012-09-13 Thread arma
commit 909691f1ae9e2b8cd806cdf43b43f99b97c5c0f4 Author: Robert Ransom Date: Thu Sep 13 23:25:03 2012 -0700 Fix man page typo --- doc/tor.1.txt |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0bd9709..5aac054 100644 --- a/doc/tor

[tor-commits] [ooni-probe/master] Fixed imports.

2012-09-13 Thread isis
commit cf5e13c241389f8192a587c0601a8cf561329ae7 Author: Isis Lovecruft Date: Fri Sep 14 02:20:52 2012 + Fixed imports. --- ooni/lib/Makefile | 30 ++ ooni/lib/__init__.py | 43 +--- ooni/lib/txscapy |1 - ooni/lib/txscapy.py| 348 ++

[tor-commits] [tor-cloud/master] Make the process of verifying the gpg signature less complicated

2012-09-13 Thread runa
commit 27013b87e0b5b0b867e059d5071167478e9492a4 Author: Runa A. Sandvik Date: Thu Sep 13 19:55:18 2012 +0100 Make the process of verifying the gpg signature less complicated --- build.sh | 25 + 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/build

[tor-commits] [atlas/master] Replace full exit policy with exit policy summary.

2012-09-13 Thread karsten
commit a6513c8ee4fa8b293264d833f98e99d8e69357fe Author: Karsten Loesing Date: Thu Sep 13 14:18:06 2012 -0400 Replace full exit policy with exit policy summary. Implements #6711. --- templates/details/main.html | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) di

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

2012-09-13 Thread nickm
commit abbde7b1849768c96b3ebf2e08e4f844c0775b9d Merge: 582f218 7d11952 Author: Nick Mathewson Date: Thu Sep 13 12:25:45 2012 -0400 Merge branch 'confparse_refactor_squashed' changes/refactor_config |3 + src/or/circuitbuild.c |2 + src/or/config.c | 1914 +---

[tor-commits] [tor/master] Remove all remaining spurious or_options_t invocations in confparse.c

2012-09-13 Thread nickm
commit 2eb2536c0a570f7c9f9a168755379f9b04b8465d Author: Nick Mathewson Date: Wed Sep 12 17:39:56 2012 -0400 Remove all remaining spurious or_options_t invocations in confparse.c --- src/or/confparse.c | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/o

[tor-commits] [tor/master] Split the or_state_t portions of config.c into their own file

2012-09-13 Thread nickm
commit 7d11952bf4b7bda604e503485036b1a80edf3fd9 Author: Nick Mathewson Date: Wed Sep 12 17:58:33 2012 -0400 Split the or_state_t portions of config.c into their own file --- src/or/circuitbuild.c |1 + src/or/config.c | 576 +-- src/or

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'

2012-09-13 Thread nickm
commit 582f2187a769ea723f6bf13bc91f7a4b3c861408 Merge: a73dec1 1e68c21 Author: Nick Mathewson Date: Thu Sep 13 10:08:51 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6827 |9 + src/or/or.h |7 +-- src/or/routerparse.c |3 +++

[tor-commits] [tor/master] Avoid undefined behaviour when parsing HS protocol versions

2012-09-13 Thread nickm
commit 0a6480cdd00fbed2eba0e5bab6ef82bc809c665b Author: Robert Ransom Date: Thu Sep 13 07:39:39 2012 -0400 Avoid undefined behaviour when parsing HS protocol versions Fixes bug 6827; bugfix on c58675ca728f12b42f65e5b8964ae695c2e0ec2d (when the v2 HS desc parser was implemented)

[tor-commits] [tor/master] mention the bug number in the 6827 changes file

2012-09-13 Thread nickm
commit 1e68c213a24237b1733cfee3726aa646a805a5a9 Author: Nick Mathewson Date: Thu Sep 13 10:07:06 2012 -0400 mention the bug number in the 6827 changes file --- changes/bug6827 |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug6827 b/changes/bug6827 index

[tor-commits] [tor/maint-0.2.3] Avoid undefined behaviour when parsing HS protocol versions

2012-09-13 Thread nickm
commit 0a6480cdd00fbed2eba0e5bab6ef82bc809c665b Author: Robert Ransom Date: Thu Sep 13 07:39:39 2012 -0400 Avoid undefined behaviour when parsing HS protocol versions Fixes bug 6827; bugfix on c58675ca728f12b42f65e5b8964ae695c2e0ec2d (when the v2 HS desc parser was implemented)

[tor-commits] [tor/maint-0.2.3] mention the bug number in the 6827 changes file

2012-09-13 Thread nickm
commit 1e68c213a24237b1733cfee3726aa646a805a5a9 Author: Nick Mathewson Date: Thu Sep 13 10:07:06 2012 -0400 mention the bug number in the 6827 changes file --- changes/bug6827 |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/changes/bug6827 b/changes/bug6827 index

[tor-commits] [research-web/master] Add the two HotPETs 2009 reports.

2012-09-13 Thread karsten
commit fd8911564d8f0f5410f9d23f09c383d16e5e387d Author: Karsten Loesing Date: Thu Sep 13 09:45:01 2012 -0400 Add the two HotPETs 2009 reports. --- techreports.bib | 20 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/techreports.bib b/techreports.bib

[tor-commits] [tech-reports/master] Merge branch 'hotpets2009-reports'

2012-09-13 Thread karsten
commit 5510bc17005c828abf46a4ca6f3bcc8ec3cac5ca Merge: 31e3007 3cab6ea Author: Karsten Loesing Date: Thu Sep 13 09:30:03 2012 -0400 Merge branch 'hotpets2009-reports' 2009/metrics/.gitignore|3 + 2009/metrics/advertised-hotpets.pdf| 2569 ++

[tor-commits] [tech-reports/master] Update metrics report to be a Tor Tech Report.

2012-09-13 Thread karsten
commit b1ce3bb644ac855003c2758d969560c68ff5739d Author: Karsten Loesing Date: Mon Aug 27 09:53:01 2012 +0200 Update metrics report to be a Tor Tech Report. --- 2009/metrics/llncs.cls | 1190 --- 2009/metrics/metrics.bib|8 +- 2009/metric

[tor-commits] [tech-reports/master] Remove unused style files.

2012-09-13 Thread karsten
commit 3cab6ea2518fbe7aeac3811f3fc7d4015a5ea01b Author: Karsten Loesing Date: Mon Aug 27 09:53:33 2012 +0200 Remove unused style files. --- 2009/torflow/llncs.cls | 1016 --- 2009/torflow/usenix.sty | 96 - 2 files changed, 0 insertions(+)

[tor-commits] [tech-reports/master] Make torflow report look like a Tor Tech Report.

2012-09-13 Thread karsten
commit 8608c2345de5b5c3d94452d231bd5b69262e52c7 Author: Karsten Loesing Date: Mon Aug 27 09:08:03 2012 +0200 Make torflow report look like a Tor Tech Report. --- 2009/torflow/torflow.bib| 53 ++ 2009/torflow/torflow.tex| 125 --

[tor-commits] [ooni-probe/master] Merge branch 'bridget-twisted'

2012-09-13 Thread isis
commit 62956ebab7779c1b61ce3d6e8ac750552fd1c988 Merge: 9c5d5d4 df76264 Author: Isis Lovecruft Date: Thu Sep 13 13:01:44 2012 + Merge branch 'bridget-twisted' ooni/assets/bridgetests.txt |8 +- ooni/ooniprobe.py | 14 +- ooni/plugins/bridget.py | 465 ++

[tor-commits] [ooni-probe/master] Submodules are working, without modification to any of the old import

2012-09-13 Thread isis
commit 1dc7a6966d1e4ec69f6bab4667384e583cf65636 Author: Isis Lovecruft Date: Tue Aug 28 12:58:42 2012 + Submodules are working, without modification to any of the old import statements. To initialize them, do "$ git submodules init && git submodules update". --- TODO | 26 +++

[tor-commits] [ooni-probe/master] Updating the ooni/lib structure and git submodules for imports, and I'm trying

2012-09-13 Thread isis
commit 174cef2f7f9bfb395fe4753280a881ca5950b504 Author: Isis Lovecruft Date: Tue Aug 28 12:02:44 2012 + Updating the ooni/lib structure and git submodules for imports, and I'm trying to keep the syntax the same. Updated the README with info on dev interaction with and user clon

[tor-commits] [ooni-probe/master] * Fix some bugs in Daphn3

2012-09-13 Thread isis
commit 14ade9b22b2d91dc3c85a7d246c76cc6bc935d22 Author: Arturo Filastò Date: Thu Aug 2 17:42:43 2012 +0200 * Fix some bugs in Daphn3 * Add more details to Test interface * Remove dead code in Reporting system * Make some changes to bridget --- ooni/ooniprobe.py |2 +-

[tor-commits] [ooni-probe/master] Changed the ooni/lib structure to use gitsubmodules so that OONI users do not

2012-09-13 Thread isis
commit 78f768540a0912619b566e1f75e518edcb29b7ff Author: Isis Lovecruft Date: Mon Aug 27 04:50:54 2012 + Changed the ooni/lib structure to use gitsubmodules so that OONI users do not accidentally git-clone broken or incompatible upstreams. Each submodule has it's own .git with b

[tor-commits] [ooni-probe/master] Actually, everything is not working. I started to fix it, but I need to work

2012-09-13 Thread isis
commit 9c5d5d4b39babb714df86089e87db36af6562085 Author: Isis Lovecruft Date: Thu Aug 30 01:04:53 2012 + Actually, everything is not working. I started to fix it, but I need to work on bridget, so I'm going to clone tpo:ooni-probe.git into a new branch now. --- ooni/ooniprobe.py

[tor-commits] [ooni-probe/master] Still getting the error from ../plugoo/test.py that "d" is a NoneType.

2012-09-13 Thread isis
commit 2004db08a6c8f2c93bf3485864a3d6eba93b8ad0 Author: Isis Lovecruft Date: Sun Aug 26 09:53:14 2012 + Still getting the error from ../plugoo/test.py that "d" is a NoneType. I'll try merging master and see if that fixes it, else I'll have to patch that before continuing. --- o

[tor-commits] [ooni-probe/master] Updating the ooni/lib structure and git submodules for imports, and I'm trying

2012-09-13 Thread isis
commit 4dcc00fdefef051ab27a03df94fa96730ece581b Author: Isis Lovecruft Date: Tue Aug 28 12:02:44 2012 + Updating the ooni/lib structure and git submodules for imports, and I'm trying to keep the syntax the same. Updated the README with info on dev interaction with and user clon

[tor-commits] [ooni-probe/master] Still sorting out that darned resolver...

2012-09-13 Thread isis
commit 13077468d151d931c4de38961be3dbb76a4eb88c Author: Isis Lovecruft Date: Sat Jul 28 01:33:23 2012 + Still sorting out that darned resolver... --- ooni/plugins/dnstamper.py | 212 ++--- 1 files changed, 121 insertions(+), 91 deletions(-) dif

[tor-commits] [ooni-probe/master] Fixed module import issues with directory structure.

2012-09-13 Thread isis
commit 37c0e4e888416a6d0433a23a164c5bd565c357ca Author: Isis Lovecruft Date: Thu May 31 12:36:50 2012 -0300 Fixed module import issues with directory structure. --- ooni/plugoo/reports.py |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/ooni/plugoo/reports.py b/o

[tor-commits] [ooni-probe/master] Unfinished, committing in order to merge changes from master. Fixed class initializations.

2012-09-13 Thread isis
commit f85da56f489198358d7d1d7fbd2338037af88ce9 Author: Isis Lovecruft Date: Thu Jul 19 18:00:00 2012 + Unfinished, committing in order to merge changes from master. Fixed class initializations. --- ooni/plugins/dnstamper.py | 43 --- 1 files

[tor-commits] [ooni-probe/master] Need to fix exp_address from d['address'] dict

2012-09-13 Thread isis
commit 0264e482d01dbbfc0a5b1f94bd98118270b7cdd6 Author: Isis Lovecruft Date: Thu Jul 26 00:17:00 2012 + Need to fix exp_address from d['address'] dict --- ooni/ooniprobe.log|1 - ooni/plugins/dnstamper.py | 92 ++--- ooni/plugoo/rep

[tor-commits] [ooni-probe/master] Adding old dnstamper.py file so git doesn't wipe it. Don't include this commit.

2012-09-13 Thread isis
commit eeed21131f3b955176ad7d0c1502f6f4551cc72a Author: Isis Lovecruft Date: Mon Jun 25 11:34:15 2012 -0700 Adding old dnstamper.py file so git doesn't wipe it. Don't include this commit. --- ooni/oonitests/dnstamper.py | 200 +++ 1 files changed,

[tor-commits] [ooni-probe/master] Added subclassed t.n.client.Resolver() to overcome query port randomization.

2012-09-13 Thread isis
commit 507694c16715f76c17b061bc49bdb32f15c81983 Author: Isis Lovecruft Date: Sat Jun 16 09:21:53 2012 -0700 Added subclassed t.n.client.Resolver() to overcome query port randomization. --- ooni/oonitests/dnstamper.py | 187 --- 1 files changed, 0 in

[tor-commits] [ooni-probe/master] Added subclassed t.n.client.Resolver() to overcome query port randomization.

2012-09-13 Thread isis
commit 5e748acc7f787d37274cbdab9a57b317919f2fa9 Author: Isis Lovecruft Date: Sat Jun 16 09:21:53 2012 -0700 Added subclassed t.n.client.Resolver() to overcome query port randomization. --- ooni/plugins/dnstamper.py | 75 1 files changed, 68 in

[tor-commits] [ooni-probe/master] Mostly done porting to twisted, still need rewrite of reverse DNS lookup method.

2012-09-13 Thread isis
commit 7150331304702d53e85a1b3123e768c551ac233d Author: Isis Lovecruft Date: Wed Jun 13 20:41:17 2012 -0700 Mostly done porting to twisted, still need rewrite of reverse DNS lookup method. --- ooni/oonitests/dnstamper.py | 129 ++ 1 files changed,

[tor-commits] [ooni-probe/master] Fixed module import issues with directory structure.

2012-09-13 Thread isis
commit 2c7552e3da6e72b1d55b9599dc3e7281a5ee266e Author: Isis Lovecruft Date: Thu May 31 12:36:50 2012 -0300 Fixed module import issues with directory structure. --- ooni/__init__.py |2 +- ooni/example_plugins/skel.py |4 ++-- ooni/ooniprobe.py|7 +++

[tor-commits] [ooni-probe/master] Implemented logging verbosity levels with global options. There's also an option now to suppress stdout. By default, all emit() messages still go the oonicli.log, reg

2012-09-13 Thread isis
commit df762643f4df5e9caec69b3b649d26f1e51c2210 Author: Isis Lovecruft Date: Thu Sep 13 12:47:40 2012 + Implemented logging verbosity levels with global options. There's also an option now to suppress stdout. By default, all emit() messages still go the oonicli.log, regardless of logg

[tor-commits] [ooni-probe/master] Still need to fix problem with getHostByName() only returned one address

2012-09-13 Thread isis
commit 891d16a70e59ea3a4324822a0b602743613530b1 Author: Isis Lovecruft Date: Fri Jun 15 17:55:32 2012 -0700 Still need to fix problem with getHostByName() only returned one address --- ooni/plugins/dnstamper.py | 195 + 1 files changed, 195 inse

[tor-commits] [ooni-probe/master] bridget is functional again, but DataDirectory still doesn't work so it takes forever and is hammering the DirAuths.

2012-09-13 Thread isis
commit b49b70ebcdb1073e7a6fddf9a384f7e9d9c7398a Author: Isis Lovecruft Date: Wed Sep 12 02:22:55 2012 + bridget is functional again, but DataDirectory still doesn't work so it takes forever and is hammering the DirAuths. --- ooni/plugins/bridget.py | 229 -

[tor-commits] [ooni-probe/master] There's still a problem with Tor's DataDirectory not being found, but it only asks for the consensus once per list of bridges/relays, i.e. once for every time bridget

2012-09-13 Thread isis
commit 859f9399455975a5d828427ede1d7e3662f1e591 Author: Isis Lovecruft Date: Thu Sep 13 12:41:39 2012 + There's still a problem with Tor's DataDirectory not being found, but it only asks for the consensus once per list of bridges/relays, i.e. once for every time bridget is run. This i

[tor-commits] [ooni-probe/master] Marked the extra import in ooni/plugoo/tests.py, but did not remove it yet.

2012-09-13 Thread isis
commit 983b8827237e7d4885dad4bc5725d3b5c8e40bbe Author: Isis Lovecruft Date: Wed Sep 12 02:20:34 2012 + Marked the extra import in ooni/plugoo/tests.py, but did not remove it yet. --- ooni/plugoo/tests.py |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oo

[tor-commits] [ooni-probe/master] error with bridges not respecting being commented out

2012-09-13 Thread isis
commit b190bb198dd6e2abe09fa5c96a3d30c82ba1a3dd Author: Isis Lovecruft Date: Tue Sep 11 12:11:39 2012 + error with bridges not respecting being commented out --- ooni/plugins/bridget.py | 75 ++ 1 files changed, 36 insertions(+), 39 deletio

[tor-commits] [ooni-probe/master] changed assets to a list for experiment to localize asynchronicity to local experiment

2012-09-13 Thread isis
commit 1f6520aa55b87b3bf76a558a4dee2b82afc1287a Author: Isis Lovecruft Date: Tue Sep 11 12:33:48 2012 + changed assets to a list for experiment to localize asynchronicity to local experiment --- ooni/plugins/bridget.py | 33 +++-- 1 files changed, 23 inse

[tor-commits] [ooni-probe/master] Moving bootstrap_tor() functions to experiment()

2012-09-13 Thread isis
commit 0b892accffdd5a09c5bba87b9c75adfcdc50eea2 Author: Isis Lovecruft Date: Tue Sep 11 11:38:45 2012 + Moving bootstrap_tor() functions to experiment() --- ooni/assets/bridgetests.txt |8 +- ooni/plugins/bridget.py | 362 -- 2 files cha

[tor-commits] [ooni-probe/master] BridgeT works again, but...

2012-09-13 Thread isis
commit c09e7f9a98e7191332f39e6d70d7bb967c5e3e8a Author: Isis Lovecruft Date: Mon Sep 3 10:55:51 2012 + BridgeT works again, but... There seems to be a problem with it attempting to ControlPort to the same port as one of my local non-slave Tors, even though TorConfig() is s