- tor-commits - lists.torproject.org

[torflow/master] Update submodule..
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit 9e4b804a398ebf5bec1ffc261577a4b84b35f220 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Aug 31 18:19:16 2011 -0700 Update submodule.. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index 25cb2bf..a3ed3d0 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit 25cb2bf77b1a98f2273b0f90c99b57e3d6e21a41 +Subproject commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa

1 0

[pytorctl/master] WARN when circ_status_event fails to query Router
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit 37f612706ad384d7a1d34a33268f3d1d8449d5f2 Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 7 14:58:37 2011 -0700 WARN when circ_status_event fails to query Router --- SQLSupport.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 1e2971b..c9951d7 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -24,6 +24,7 @@ from TorCtl import EVENT_TYPE, EVENT_STATE, TorCtlError import sqlalchemy import sqlalchemy.orm.exc from sqlalchemy.orm import scoped_session, sessionmaker, eagerload, lazyload, eagerload_all +from sqlalchemy.orm.exc import NoResultFound from sqlalchemy import create_engine, and_, or_, not_, func from sqlalchemy.sql import func,select,alias,case from sqlalchemy.schema import ThreadLocalMetaData,MetaData @@ -870,8 +871,13 @@ class CircuitListener(TorCtl.PreEventListener): last_extend=c.arrived_at) if self.track_parent: for r in self.parent_handler.circuits[c.circ_id].path: - rq = Router.query.options(eagerload('circuits')).filter_by( + try: + rq = Router.query.options(eagerload('circuits')).filter_by( idhex=r.idhex).with_labels().one() + except NoResultFound: + plog("WARN", "Query for Router %s=%s in circ %s failed but was in parent_handler" % + (r.nickname, r.idhex, circ.circ_id)) + return; circ.routers.append(rq) #rq.circuits.append(circ) # done automagically? #tc_session.add(rq)

1 0

[pytorctl/master] remove ;
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit 4a990f47e5ecd26af4f6459ae6d63ea36dd88f00 Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 16:24:27 2011 -0700 remove ; --- SQLSupport.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 5933707..efee35b 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -879,7 +879,8 @@ class CircuitListener(TorCtl.PreEventListener): except NoResultFound: plog("WARN", "Query for Router %s=%s in circ %s failed but was in parent_handler" % (r.nickname, r.idhex, circ.circ_id)) - return; + tc_session.remove() + return circ.routers.append(rq) #rq.circuits.append(circ) # done automagically? #tc_session.add(rq)

1 0

[pytorctl/master] placeholder for call to refresh_all()
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit 741cc04db278cede4bbe0c9e0147066fbfd00a4b Author: aagbsn <aagbsn(a)extc.org> Date: Thu Jul 7 15:21:26 2011 -0700 placeholder for call to refresh_all() suspicious session behavior may require refreshing all objects in order to keep tc_session and sessions bound to Elixir synchronized --- SQLSupport.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index c9951d7..718bf35 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -772,6 +772,8 @@ class ConsensusTrackerListener(TorCtl.DualEventListener): tc_session.add(r) plog("INFO", "Consensus db updated") tc_session.commit() + # testing + #refresh_all() # Too many sessions, don't trust commit() def update_consensus(self): plog("INFO", "Updating DB with full consensus.")

1 0

[pytorctl/master] use Elixir model delete method
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit db835ef1f6a252d9923be766f1d7dc813ea9a4eb Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 16:09:00 2011 -0700 use Elixir model delete method try to use the same session for deletes and queries where possible, this may be the cause of an ObjectNotFound exception that occurs right after _update_db(), despite the Router object being in the consensus and also in the db. --- SQLSupport.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 718bf35..5933707 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -1023,7 +1023,7 @@ class StreamListener(CircuitListener): (s.strm_id not in self.parent_handler.streams or \ self.parent_handler.streams[s.strm_id].ignored): if strm: - tc_session.delete(strm) + strm.delete() tc_session.commit() return # Ignore streams that aren't ours @@ -1038,7 +1038,7 @@ class StreamListener(CircuitListener): strm.circuit = Circuit.query.filter_by(circ_id=s.circ_id).first() if not strm.circuit: plog("NOTICE", "Ignoring prior stream "+str(strm.strm_id)+" with old circuit "+str(s.circ_id)) - tc_session.delete(strm) + strm.delete() tc_session.commit() return else:

1 0

[pytorctl/master] add function to get current branch and head
by mikeperry＠torproject.org 01 Sep '11

01 Sep '11

commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa Author: aagbsn <aagbsn(a)extc.org> Date: Wed Aug 31 17:07:27 2011 -0700 add function to get current branch and head --- TorUtil.py | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/TorUtil.py b/TorUtil.py index b8d6425..50258e5 100644 --- a/TorUtil.py +++ b/TorUtil.py @@ -417,3 +417,25 @@ Usage: lzprob(z) prob = ((1.0-x)*0.5) return prob +def get_git_version(path_to_repo): + """ Returns a tuple of the branch and head from a git repo (.git) + if available, or returns ('unknown', 'unknown') + """ + try: + f = open(path_to_repo+'HEAD') + ref = f.readline().strip().split(' ') + f.close() + except IOError, e: + plog('ERROR', e) + return ('unknown','unknown') + try: + f = open(path_to_repo+ref[1]) + branch = ref[1].strip().split('/')[-1] + head = f.readline().strip() + f.close() + return (branch, head) + except IOError, e: + plog('ERROR', e) + except IndexError, e: + plog('ERROR', e) + return ('unknown','unknown')

1 0

[torbrowser/maint-2.2] bump libevent library names for 2.0.14-stable
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 7f5edf6876e20387977979a0c3b2a1fd6388c512 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 21:35:30 2011 +0100 bump libevent library names for 2.0.14-stable --- build-scripts/linux.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 60dce48..e7eaf94 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -281,9 +281,9 @@ install-binaries: # zlib cp -d $(ZLIB)/libz.so $(ZLIB)/libz.so.1 $(ZLIB)/libz.so.1.2.5 $(LIBSDIR)/libz # Libevent - cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.2 $(LIBEVENT)/libevent_core.so \ - $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.2 \ - $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.2 \ + cp -d $(LIBEVENT)/libevent-2.0.so.5 $(LIBEVENT)/libevent-2.0.so.5.1.3 $(LIBEVENT)/libevent_core.so \ + $(LIBEVENT)/libevent_core-2.0.so.5 $(LIBEVENT)/libevent_core-2.0.so.5.1.3 \ + $(LIBEVENT)/libevent_extra-2.0.so.5 $(LIBEVENT)/libevent_extra-2.0.so.5.1.3 \ $(LIBEVENT)/libevent_extra.so $(LIBEVENT)/libevent.so $(LIBSDIR) # libpng cp -d $(LIBPNG)/libpng14.so* $(LIBSDIR)

1 0

[torbrowser/maint-2.2] rename osx bundles from -alpha to -dev
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit da9cf1e9d9f575d1f54fc9e14f845736e9a2efdf Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 21:35:53 2011 +0100 rename osx bundles from -alpha to -dev --- build-scripts/osx.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 816dd24..bdef4dc 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -157,7 +157,7 @@ NAME=TorBrowser DISTDIR=tbbosx-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=TorBrowser-$(VERSION)-osx-$(ARCH_TYPE)- IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)

1 0

[torbrowser/maint-2.2] change linux package name to use -dev not -alpha
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 2fd5e9a60ef4cdf0df97c7c44992cfbc4f6ff0c5 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:51:25 2011 +0100 change linux package name to use -dev not -alpha --- build-scripts/linux.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 2b329b0..60dce48 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -168,7 +168,7 @@ NAME=tor-browser DISTDIR=tbbl-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-$(BUILD_NUM)-alpha +VERSION=$(RELEASE_VER)-$(BUILD_NUM)-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0

[torbrowser/maint-2.2] bump versions in readmes
by erinn＠torproject.org 31 Aug '11

31 Aug '11

commit 698e441c6a91c54c5276c2f33988a727066c20f5 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Aug 31 20:33:47 2011 +0100 bump versions in readmes --- README.LINUX-2.2 | 4 ++-- README.OSX-2.2 | 4 ++-- README.WIN-2.2 | 6 +++--- build-scripts/linux.mk | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 176ee30..e4ac63e 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -5,8 +5,8 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.OSX-2.2 b/README.OSX-2.2 index de6e27c..185d11c 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -5,8 +5,8 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 5ab55a0..723df9a 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -5,9 +5,9 @@ Included applications --------------------- Vidalia 0.2.14 (with Qt 4.6.2) -Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 6.0 - \_ Firefox (Aurora) 6.0 +Tor 0.2.2.32 (with libevent-2.0.14-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 6.0.1 + \_ Firefox (Aurora) 6.0.1 \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index b32b258..616fe6a 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -36,7 +36,7 @@ include $(PWD)/versions.mk ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=1 +BUILD_NUM=2 PLATFORM=Linux ## Location of directory for source unpacking

1 0