[tor-commits] [arm/master] Separating inital BW totals into separate params

2011-04-23 Thread sebastian
commit b4ea3bd612d54ff1e33c4b52d4982ccfc207d9fb Author: Damian Johnson Date: Sat Apr 23 20:34:31 2011 -0700 Separating inital BW totals into separate params Mixing the bandwidth totals fetched from Tor with the GraphStats param caused the average measurement to be skewed. Sepa

[tor-commits] [arm/master] Dropping optional total prepopulation state file

2011-04-23 Thread sebastian
commit 4f3f7cfd957bc55f956e21e8af82888a24ec7ff4 Author: Damian Johnson Date: Sat Apr 23 20:30:41 2011 -0700 Dropping optional total prepopulation state file The total value provided by the 'features.graph.bw.prepopulateTotal' config option was confusing, pointless, and conflict

[tor-commits] [arm/master] Ignoring vim temporary swap files

2011-04-23 Thread sebastian
commit b38cd993ee6d717372f479329236a7ab0a019f79 Author: Damian Johnson Date: Sat Apr 23 20:22:17 2011 -0700 Ignoring vim temporary swap files --- .gitignore |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 9b955dd..6377435 100644 --- a/

[tor-commits] [arm/master] Fetching pid with 'GETINFO process/pid' if able

2011-04-23 Thread sebastian
commit a1271d49f14f8d63e983043e677c92ba15fa9c9b Author: Damian Johnson Date: Fri Apr 22 19:12:34 2011 -0700 Fetching pid with 'GETINFO process/pid' if able This is a new controller option added in ticket 2291 (https://trac.torproject.org/projects/tor/ticket/2291). This was test

[tor-commits] [arm/master] Better commenting for new controller option usage

2011-04-23 Thread sebastian
commit 1ff5c3d8307a38485f850ba4936d4ab2e16bed7d Author: Damian Johnson Date: Fri Apr 22 19:18:50 2011 -0700 Better commenting for new controller option usage --- src/util/torTools.py | 13 - 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/util/torTools.py b

[tor-commits] [arm/master] Version bump for 1.4.2.4

2011-04-23 Thread sebastian
commit 152f8511da9db90dedbacb6697d3bc214644931c Author: Damian Johnson Date: Thu Apr 21 08:20:19 2011 -0700 Version bump for 1.4.2.4 --- src/version.py |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.py b/src/version.py index 4c0bbc8..e33cb18 100644

[tor-commits] [arm/master] Putting TorCtl install prompt in its own function

2011-04-23 Thread sebastian
commit 6534807224d5f88b0c5450e996e5fa1f8c470763 Author: Damian Johnson Date: Thu Apr 21 08:52:36 2011 -0700 Putting TorCtl install prompt in its own function --- src/prereq.py | 41 ++--- 1 files changed, 26 insertions(+), 15 deletions(-) diff --git a

[tor-commits] [arm/master] Merge release commit '8b8568e'

2011-04-23 Thread sebastian
commit 8b4d9f13e50f6a420b1000c70de25bf244db393a Merge: 6534807 8b8568e Author: Damian Johnson Date: Thu Apr 21 09:42:15 2011 -0700 Merge release commit '8b8568e' Conflicts: src/version.py setup.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

[tor-commits] [arm/master] Initializing bandwidth totals from Tor when able

2011-04-23 Thread sebastian
commit 301085e92801173d884e8a1282539282331244d8 Author: Damian Johnson Date: Sat Apr 23 20:24:55 2011 -0700 Initializing bandwidth totals from Tor when able Ticket 2345 (https://trac.torproject.org/projects/tor/ticket/2345) introduced GETINFO options for the total read and wri

[tor-commits] [arm/master] Triggering deb-build logic when in "release_deb"

2011-04-23 Thread sebastian
commit 8b8568eda8145f6c2ab4295a7924a63a7617ff39 Author: Damian Johnson Date: Thu Apr 21 09:38:03 2011 -0700 Triggering deb-build logic when in "release_deb" The deb-prep.sh script makes a release_deb directory in which the build takes place. Triggering off of tor-arm is insuff

[tor-commits] [arm/master] Offering to install TorCtl if unavailable

2011-04-23 Thread sebastian
commit d1d54c08e245083660394d0e11b41c593099fc2f Author: Damian Johnson Date: Wed Apr 20 19:38:17 2011 -0700 Offering to install TorCtl if unavailable --- src/prereq.py | 60 + 1 files changed, 60 insertions(+), 0 deletions(-) diff

[tor-commits] [arm/master] Hotfix for r24570.

2011-04-23 Thread sebastian
commit 8b498b39a4f48e44b3addce98a239438f131361a Author: Damian Johnson Date: Thu Apr 7 01:30:11 2011 + Hotfix for r24570. svn:r24571 --- setup.py |2 +- src/version.py |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/se

[tor-commits] [arm/master] Another hotfix from Fabian (for decimal seconds in the uptime field of ps results)

2011-04-23 Thread sebastian
commit bb7c907e840b6e4ef6f9af671a763b4bc79df0ec Merge: 4794d92 623d26f Author: Damian Johnson Date: Thu Jan 13 03:11:36 2011 + Another hotfix from Fabian (for decimal seconds in the uptime field of ps results) svn:r24075 src/util/uiTools.py |6 ++ src/versi

[tor-commits] [arm/master] Merge release commit 'bcb4729'

2011-04-23 Thread sebastian
commit 43656fe1228ecf1bdc0ffce792e32a98f14241ea Merge: d1d54c0 bcb4729 Author: Damian Johnson Date: Thu Apr 21 08:39:04 2011 -0700 Merge release commit 'bcb4729' Conflicts: ChangeLog setup.py src/version.py setup.py |8 +++- 1 files changed, 7 inse

[tor-commits] [arm/master] Hotfix for r24613 (release 1.4.2.3)

2011-04-23 Thread sebastian
commit 855ccf62986c1db2e1f0e42b5a1498a2c3d1f61a Author: Damian Johnson Date: Wed Apr 13 14:58:56 2011 + Hotfix for r24613 (release 1.4.2.3) svn:r24614 --- src/interface/connections/connEntry.py |2 +- src/version.py |4 ++-- 2 files ch

[tor-commits] [arm/master] Reverting change to the license (looks like that isn't allowed) and removing copyright section from the man page.

2011-04-23 Thread sebastian
commit a40075d0258738b4620f95c541ca8fd20a2d2bfc Author: Damian Johnson Date: Sun Dec 12 01:02:54 2010 + Reverting change to the license (looks like that isn't allowed) and removing copyright section from the man page. svn:r23927 --- LICENSE |2 +- arm.1 |3

[tor-commits] [arm/master] Excluding TorCtl from install when building deb

2011-04-23 Thread sebastian
commit bcb4729c2238e5520e158905b8ba242d2d00722b Author: Damian Johnson Date: Wed Apr 20 18:44:21 2011 -0700 Excluding TorCtl from install when building deb Dererk is maintaining a deb for TorCtl (python-torctl, http://packages.debian.org/unstable/main/python-torctl) which will be a re

[tor-commits] [arm/master] Arm version 1.4.2 release.

2011-04-23 Thread sebastian
commit d0bb81a4518525860666f7ad19315d8164c74697 Merge: 5fe915d d2204b4 Author: Damian Johnson Date: Mon Apr 4 15:22:31 2011 + Arm version 1.4.2 release. svn:r24555 ChangeLog| 48 ++ README | 27 +-

[tor-commits] [arm/master] fix: Capitalizing unused cfg option log message

2011-04-23 Thread sebastian
commit 9ba121e859d8c551be08e340728004fa48ec1c4d Author: Damian Johnson Date: Fri Apr 22 19:05:40 2011 -0700 fix: Capitalizing unused cfg option log message --- src/interface/controller.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/interface/controller.py

[tor-commits] [arm/master] Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option)

2011-04-23 Thread sebastian
commit e11b597f2f9e10c5ddc173a32c9c080d1d886179 Author: Damian Johnson Date: Tue Apr 5 02:44:58 2011 + Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option) svn:r24562 --- ChangeLog|8 +++- sr

[tor-commits] [arm/master] Making git ignore TorCtl and python bytecode (pyc)

2011-04-23 Thread sebastian
commit e8f3e8ce98faf315dfe2f40dac978c4066894211 Author: Damian Johnson Date: Wed Apr 20 19:30:08 2011 -0700 Making git ignore TorCtl and python bytecode (pyc) --- .gitignore |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100

[tor-commits] [arm/master] Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/349792)

2011-04-23 Thread sebastian
commit 5fe915d46d01906215676e64765abb2d9b4064f5 Author: Damian Johnson Date: Sun Jan 16 02:18:44 2011 + Hotfix to help gentoo ebuilds (https://bugs.gentoo.org/349792) svn:r24092 --- setup.py | 20 ++-- src/version.py |4 ++-- 2 files chang

[tor-commits] [arm/master] Hotfix for the 1.4.1 release:

2011-04-23 Thread sebastian
commit 4794d9275c50f3cfb850e8bfbfde828bafe53dd4 Merge: 95e0106 9b1b7b5 Author: Damian Johnson Date: Wed Jan 12 04:56:09 2011 + Hotfix for the 1.4.1 release: change: including platform, python version, and arm/tor configurations in debug dumps change: adding summaries for server

[tor-commits] [arm/master] Bumping the version for the hotfix.

2011-04-23 Thread sebastian
commit cfa0fd24792e7d5c95303d5de10727f04fec99d0 Author: Damian Johnson Date: Fri Oct 8 16:42:15 2010 + Bumping the version for the hotfix. svn:r23465 --- src/version.py |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.py b/src/v

[tor-commits] [arm/master] Bumping version in debian changelog for hotfix release.

2011-04-23 Thread sebastian
commit 76dcdd263dc172c97e46516cecabca321257b5ce Author: Damian Johnson Date: Fri Oct 8 17:00:14 2010 + Bumping version in debian changelog for hotfix release. svn:r23466 --- debian/changelog |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git

[tor-commits] [arm/master] More fixes for issues caught by weasel

2011-04-23 Thread sebastian
commit c43535aee0c9038fefa7867ffc511dea4e258568 Author: Damian Johnson Date: Sun Dec 12 00:21:28 2010 + More fixes for issues caught by weasel change: noting myself in the license file fix: startup script wasn't hanlding unusual paths, such as with spaces and dashes fix: st

[tor-commits] [arm/master] Changing arm's versioning scheme to differentiate it from debian.

2011-04-23 Thread sebastian
commit 8dac24227ae6a8eb61da31ea6cb64c0eb3ebc6a2 Author: Damian Johnson Date: Tue Dec 7 17:42:11 2010 + Changing arm's versioning scheme to differentiate it from debian. svn:r23899 --- src/version.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --

[tor-commits] [arm/master] Hotfixes for a couple issues discovered in the release and repairing the rpm build (not quite working yet, though).

2011-04-23 Thread sebastian
commit 79b7e13a0d6050f924b56ea8e62ecbf826917dbd Author: Damian Johnson Date: Wed Dec 1 03:55:25 2010 + Hotfixes for a couple issues discovered in the release and repairing the rpm build (not quite working yet, though). fix: install script was failing to make the temporary directory

[tor-commits] [arm/master] Arm release 1.4.1

2011-04-23 Thread sebastian
commit 95e0106a445f82aececb92d201838454dd5e982e Merge: a40075d 984052d Author: Damian Johnson Date: Sat Jan 8 06:35:08 2011 + Arm release 1.4.1 svn:r24054 ChangeLog| 46 ++- README | 39 +- TODO

[tor-commits] [arm/master] Hotfix for the graphing issue tomb spotted as a hotfix. Also updating the TODO for kicks and giggles.

2011-04-23 Thread sebastian
commit e9d0ac02c1df9239e6dc094bbbd7e9e2b68bcf20 Author: Damian Johnson Date: Fri Oct 8 16:39:11 2010 + Hotfix for the graphing issue tomb spotted as a hotfix. Also updating the TODO for kicks and giggles. svn:r23464 --- TODO | 226 ++

[tor-commits] [arm/master] Merging to release for version 1.4.0

2011-04-23 Thread sebastian
commit f403cccb5119e4290c5dce370249f2cade3b7617 Merge: 76dcdd2 c43410c Author: Damian Johnson Date: Sun Nov 28 10:58:57 2010 + Merging to release for version 1.4.0 svn:r23873 ChangeLog| 46 ++- README

[tor-commits] [arm/master] Removing dependency on python 2.6 for installation and building.

2011-04-23 Thread sebastian
commit 66b3c94952d819341fc374326ff3cc7178cbb447 Author: Damian Johnson Date: Tue Dec 7 17:46:03 2010 + Removing dependency on python 2.6 for installation and building. This was using the gzip name attribute unnecessarily which isn't available in older python versions (caught by wea

[tor-commits] [arm/master] Merging trunk for release 1.3.7.

2011-04-23 Thread sebastian
commit 3f79f47e553e6b55fa5771b262a5cf9dad08f4fc Merge: 36fae04 428c94e Author: Damian Johnson Date: Thu Oct 7 05:06:02 2010 + Merging trunk for release 1.3.7. svn:r23439 ChangeLog| 55 ++- README |

[tor-commits] [arm/master] Revisions for the deb release build.

2011-04-23 Thread sebastian
commit 9da2275af16d586dcfc30582765dcfc6b1d898d0 Author: Damian Johnson Date: Thu Oct 7 06:08:47 2010 + Revisions for the deb release build. svn:r23441 --- debian/changelog | 10 -- debian/control |4 ++-- 2 files changed, 10 insertions(+), 4 deletions

[tor-commits] [arm/master] Upping the release version to reflect the previous hotfix.

2011-04-23 Thread sebastian
commit 36fae04fe74e06fe18851b723c2a3fb535344c10 Author: Damian Johnson Date: Tue Aug 10 03:24:23 2010 + Upping the release version to reflect the previous hotfix. svn:r22850 --- init/starter.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a

[tor-commits] [arm/master] Rewrite of the first third of the interface, providing vastly improved performance, maintainability, and a few very nice features.

2011-04-23 Thread sebastian
commit c4e034f4789fe2ef65b6d3bed78d59ed308087cb Merge: e3b7f0e 426c879 Author: Damian Johnson Date: Wed Jul 7 16:48:51 2010 + Rewrite of the first third of the interface, providing vastly improved performance, maintainability, and a few very nice features. added: settings are fetch

[tor-commits] [arm/master] Backporting fix for parsing multi-line exit policies to current release.

2011-04-23 Thread sebastian
commit d50aefb997137c360b4cd51d31faf83d93d9417d Author: Damian Johnson Date: Sat Aug 7 22:00:08 2010 + Backporting fix for parsing multi-line exit policies to current release. svn:r22820 --- interface/connPanel.py |7 +-- 1 files changed, 5 insertions(+), 2 d

[tor-commits] [arm/packaging] Adding an exporter script for arm's release branch

2011-04-23 Thread sebastian
commit ff6e10a843539f92e9178606c81ea7044356bed2 Author: Damian Johnson Date: Fri Apr 22 17:57:18 2011 -0700 Adding an exporter script for arm's release branch A downside of moving from svn to git is that we no longer have a bundled TorCtl or easy counterpart of 'svn export'. T

[tor-commits] [arm/packaging] Applying dererk's patches for removing torctl

2011-04-23 Thread sebastian
commit b550c7e53e3b9274d0f8dd98f6b13c80ca545b22 Author: Damian Johnson Date: Fri Apr 22 09:20:30 2011 -0700 Applying dererk's patches for removing torctl Dererk removed the bundled TorCtl for the previously uploaded arm deb and added himself to the uploaders field. Adding the debi

[tor-commits] [arm/packaging] Including additional deb changes in its changelog

2011-04-23 Thread sebastian
commit c2b25c5eaf366c72cf3e359a7d774eb03b5e550e Author: Damian Johnson Date: Sat Apr 23 10:27:11 2011 -0700 Including additional deb changes in its changelog --- build/debian/changelog |9 +++-- 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/debian/changelog b

[tor-commits] [arm/packaging] Bumping the Debian Standards-Version

2011-04-23 Thread sebastian
commit b78238a33c5763382d6c85ddca74197851bf5a7d Author: Damian Johnson Date: Fri Apr 22 09:33:17 2011 -0700 Bumping the Debian Standards-Version suggested by dererk --- build/debian/changelog |8 +++- build/debian/control |2 +- 2 files changed, 8 insertions(+), 2 de

[tor-commits] [arm/packaging] Making deb-prep take the arm version as an arg

2011-04-23 Thread sebastian
commit 292058c721a7370da6fb54094bf784b37d5d5599 Author: Damian Johnson Date: Fri Apr 22 09:05:03 2011 -0700 Making deb-prep take the arm version as an arg --- build/debian/README.source |2 +- deb-prep.sh|9 +++-- 2 files changed, 8 insertions(+), 3 deletions(-)

[tor-commits] [arm/packaging] Deb build process expects a local branches

2011-04-23 Thread sebastian
commit e8cf0f4e96443dccfc9f0afa1674345631933e43 Author: Damian Johnson Date: Thu Apr 21 09:24:10 2011 -0700 Deb build process expects a local branches The deb-prep.sh script is written to use a local release and packaging branch, so if they don't exist it errors. --- build/debian/READ

[tor-commits] [arm/packaging] VCS fields are expected to be in the upper section

2011-04-23 Thread sebastian
commit 129a413b23edeca1274351d858bc2661a9dd6c08 Author: Damian Johnson Date: Thu Apr 21 09:32:19 2011 -0700 VCS fields are expected to be in the upper section When in the build contents of deb/control this casued repeated warnings (not lintian errors): dpkg-source: warning: unknown

[tor-commits] [arm/packaging] Bumping deb changelog to 1.4.2.4.

2011-04-23 Thread sebastian
commit 8291777b45b337037be469a988a83051840e6b41 Author: Damian Johnson Date: Thu Apr 21 17:48:56 2011 -0700 Bumping deb changelog to 1.4.2.4. --- build/debian/changelog |6 ++ deb-prep.sh|4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/d

[tor-commits] [arm/packaging] Including instructions for rebuilding in the deb

2011-04-23 Thread sebastian
commit 110e0bd86b1a2182a3f4f993c9c43413c181938f Author: Damian Johnson Date: Thu Apr 21 09:13:36 2011 -0700 Including instructions for rebuilding in the deb requested by intrigeri in debian bug 623311 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623311) --- build/debian/README.so

[tor-commits] [arm/packaging] Adding VCS metadata to debian package

2011-04-23 Thread sebastian
commit d9bf01fc5ea0fa21a801f64341b8f129ed17c04b Author: Damian Johnson Date: Thu Apr 21 09:03:30 2011 -0700 Adding VCS metadata to debian package requested by intrigeri in debian bug 623312 (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623312) --- build/debian/control |2 ++ 1

[tor-commits] [arm/packaging] Adding a deb dependency on python-torctl

2011-04-23 Thread sebastian
commit d811ae2376b324954d0fb5b2834f890c25c5a768 Author: Damian Johnson Date: Thu Apr 21 08:57:42 2011 -0700 Adding a deb dependency on python-torctl --- build/debian/control |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build/debian/control b/build/debian/contro

[tor-commits] [arm/packaging] Moving last useful bit from notes to deb-prep.sh

2011-04-23 Thread sebastian
commit bc7f08817ec149523e911fea706fc583adbd9e69 Author: Damian Johnson Date: Thu Apr 21 08:08:51 2011 -0700 Moving last useful bit from notes to deb-prep.sh --- deb-prep.sh |4 +++- notes.txt | 16 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/deb

[tor-commits] [arm/packaging] Converting rpm prep to use git rather than svn

2011-04-23 Thread sebastian
commit 89ffa9d28314ddcc913a60c369fc801beab669dd Author: Damian Johnson Date: Thu Apr 21 07:59:33 2011 -0700 Converting rpm prep to use git rather than svn --- rpm-prep.sh |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rpm-prep.sh b/rpm-prep.sh index 5c22f83..0

[tor-commits] [arm/packaging] Converting deb prep to use git rather than svn

2011-04-23 Thread sebastian
commit 1a3cbf38fd9cbffa42d211055201892b112e210c Author: Damian Johnson Date: Thu Apr 21 07:57:06 2011 -0700 Converting deb prep to use git rather than svn --- deb-prep.sh | 10 +++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/deb-prep.sh b/deb-prep.sh index 69f10

[tor-commits] [arm/release] Triggering deb-build logic when in "release_deb"

2011-04-23 Thread sebastian
commit 8b8568eda8145f6c2ab4295a7924a63a7617ff39 Author: Damian Johnson Date: Thu Apr 21 09:38:03 2011 -0700 Triggering deb-build logic when in "release_deb" The deb-prep.sh script makes a release_deb directory in which the build takes place. Triggering off of tor-arm is insuff

[tor-commits] [arm/release] Version bump for 1.4.2.4

2011-04-23 Thread sebastian
commit 152f8511da9db90dedbacb6697d3bc214644931c Author: Damian Johnson Date: Thu Apr 21 08:20:19 2011 -0700 Version bump for 1.4.2.4 --- src/version.py |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.py b/src/version.py index 4c0bbc8..e33cb18 100644

[tor-commits] [arm/release] Excluding TorCtl from install when building deb

2011-04-23 Thread sebastian
commit bcb4729c2238e5520e158905b8ba242d2d00722b Author: Damian Johnson Date: Wed Apr 20 18:44:21 2011 -0700 Excluding TorCtl from install when building deb Dererk is maintaining a deb for TorCtl (python-torctl, http://packages.debian.org/unstable/main/python-torctl) which will be a re

[tor-commits] r24666: {torstatus} Fix a an XSS opportunity due to missing sanitation of descri (torstatus/trunk/web)

2011-04-23 Thread Sebastian Hahn
Author: sebastian Date: 2011-04-23 13:38:55 + (Sat, 23 Apr 2011) New Revision: 24666 Modified: torstatus/trunk/web/index.php Log: Fix a an XSS opportunity due to missing sanitation of descriptor values when displaying the contact column. Issue discovered and patch submitted by tagnaq. Mod