tor-commits September 2012

tor-commits@lists.torproject.org

18 participants
792 discussions

[pyonionoo/master] Fix country parameter
by karsten＠torproject.org 22 Sep '12

22 Sep '12

commit db4194620e347b245974078dbc8f43248e5631b5 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Sep 21 23:30:33 2012 +0530 Fix country parameter --- pyonionoo/database.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pyonionoo/database.py b/pyonionoo/database.py index 1bc555b..b0aaae8 100644 --- a/pyonionoo/database.py +++ b/pyonionoo/database.py @@ -247,7 +247,7 @@ def query_summary_tbl(running_filter=None, type_filter=None, hex_fingerprint_fil if hex_fingerprint_filter: clauses.append("fingerprint = '%s'" % hex_fingerprint_filter) if country_filter: - clauses.append("country = '%s'" % country_filter) + clauses.append("country_code = '%s'" % country_filter) where_clause = ('WHERE %s' % ' and '.join(clauses)) if clauses else '' # Construct the ORDER, LIMIT, and OFFSET clauses.

1 0

[pyonionoo/master] Refactor database.py
by karsten＠torproject.org 22 Sep '12

22 Sep '12

commit 75d34050654175e9f952d98966476c173d40cd2a Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Fri Sep 21 19:11:55 2012 +0530 Refactor database.py This is a pretty big commit with lots of refactoring: - Remove certain global vars, use config file - Remove freshen_database() - It's now a part of update_databases() - get_database() is now renamed to get_database_conn(), and removed the unused conn.row_factory variable - update_database() is now renamed to update_databases() - Add more logging info - Make modular insertion statements - get_summary_routers() returns relays/bridges which are now Router objects - Refactor code * Remove unnecessary return statements and whitespace * Make multiline statements more pythonic --- pyonionoo.conf | 2 +- pyonionoo/config.py | 4 +- pyonionoo/database.py | 202 ++++++++++++++++++++-------------------- pyonionoo/handlers/summary.py | 9 +- pyonionoo/parser.py | 18 ++-- pyonionoo/web.py | 2 +- 6 files changed, 118 insertions(+), 119 deletions(-) diff --git a/pyonionoo.conf b/pyonionoo.conf index 6e93de1..d3bbf60 100644 --- a/pyonionoo.conf +++ b/pyonionoo.conf @@ -30,4 +30,4 @@ debug = no [metrics] out_dir = /tmp - +summary_file = summary diff --git a/pyonionoo/config.py b/pyonionoo/config.py index 1de03b0..ed8001b 100644 --- a/pyonionoo/config.py +++ b/pyonionoo/config.py @@ -61,6 +61,6 @@ def parse_config(filename): else: settings["mysql_settings"] = None - settings['metrics_out'] = xget(cfg.get, 'metrics', 'out_dir', None) - + settings['metrics_out'] = xget(cfg.get, 'metrics', 'out_dir', '/tmp') + settings['summary_file'] = xget(cfg.get, 'metrics', 'summary_file', 'summary') return settings diff --git a/pyonionoo/database.py b/pyonionoo/database.py index 8dd369f..1bc555b 100644 --- a/pyonionoo/database.py +++ b/pyonionoo/database.py @@ -7,14 +7,6 @@ import time from pyonionoo.parser import Router -# Metrics out/ directory. -METRICS_OUT = None - -# Summary document that will be read into an SQLite database. This should -# probably be defined in a configuration file somewhere. -SUMMARY_FILE = 'summary' -SUMMARY = None - # Name of the SQLite database. This should be defined in a configuration file # somewhere. And it should be ':memory:', not a file. BUT: it seems that # (1) sqlite3.Connection objects are not thread-safe, and (2) if different @@ -90,19 +82,28 @@ def _create_table(conn, tbl_name, schema): cursor = conn.cursor() + logging.info("Creating table %s" % (tbl_name)) # Can only use placeholders in select statements? cursor.execute('DROP TABLE IF EXISTS %s' % tbl_name) cursor.execute('CREATE TABLE %s (%s)' % (tbl_name, schema)) + logging.info("Created table %s" % (tbl_name)) + +def bootstrap_database(metrics_out, summary_file): + """ + Bootstraps the database creation process: + * Create 3 databases - summary, flags, addresses + * Updates the databases - return + @type metrics_out: string + @param metrics_out: path to metrics data dir -def create_database(metrics_out): - global METRICS_OUT, SUMMARY + @type summary_file: string + @param summary_file: summary file name + """ - METRICS_OUT = metrics_out - SUMMARY = os.path.join(METRICS_OUT, SUMMARY_FILE) + summary_file = os.path.join(metrics_out, summary_file) - conn = sqlite3.connect(DBNAME) + conn = get_database_conn() # Create the tables. _create_table(conn, summary_tbl_name, summary_schema) @@ -111,17 +112,11 @@ def create_database(metrics_out): conn.commit() - freshen_database() - - return - + update_databases(summary_file) -def update_database(): +def update_databases(summary_file=None): """ - Create the database. - - rtype: sqlite3.Connection - return: A connection object for the database that has been created. + Updates all three databases information. This operation operates as a single transaction. Therefore, the database can be read by other requests while it is being @@ -129,16 +124,19 @@ def update_database(): database. Once this function completes, all future reads will be from the "updated" database. """ - global DB_CREATION_TIME - logging.info("Updating database.") + if DB_CREATION_TIME >= os.stat(summary_file).st_mtime: + return + + logging.info("Updating database") # It seems that the default isolation_level is probably OK for # all of this to be done in a single transaction. - conn = sqlite3.connect(DBNAME, isolation_level='IMMEDIATE') + conn = get_database_conn() # First delete all records. + logging.info("Deleting data from databases") CURSOR = conn.cursor() CURSOR.execute('DELETE FROM %s' % summary_tbl_name) CURSOR.execute('DELETE FROM %s' % flags_tbl_name) @@ -153,68 +151,74 @@ def update_database(): # field in the flags/addresses table. Here we can avoid all those # selects, because the rowid attribute of the cursor is set to that # id field right after we execute the (individual) insert statements. - fields = ('type', 'nickname', 'fingerprint', 'running', - 'time_published', 'OR_port', 'dir_port', 'consensus_weight', - 'country_code', 'hostname', 'time_lookup') - insert_stmt = ('insert into %s (%s) values (%s)' % - (summary_tbl_name, ','.join(fields), ','.join(['?']*len(fields)))) - with open(SUMMARY) as f: + summary_fields = ('type', 'nickname', 'fingerprint', 'running', + 'time_published', 'OR_port', 'dir_port', 'consensus_weight', + 'country_code', 'hostname', 'time_lookup') + addresses_fields = ('id_of_row', 'address') + flags_fields = ('id_of_row', 'flag') + + insert_stmt = 'insert into %s (%s) values (%s)' + + # create insertion statement for summary table + summary_insert_stmt = (insert_stmt % (summary_tbl_name, ','.join(summary_fields), + ','.join(['?']*len(summary_fields)))) + + # create insertion statement for addresses table + addresses_insert_stmt = (insert_stmt % (addresses_tbl_name, ','.join(addresses_fields), + ','.join(['?']*len(addresses_fields)))) + + # create insertion statement for flags table + flags_insert_stmt = (insert_stmt % (flags_tbl_name, ','.join(flags_fields), + ','.join(['?']*len(flags_fields)))) + if not summary_file: + # raise Exception? + return + + with open(summary_file) as f: for line in f.readlines(): - router = Router(line) - - router_type = 'r' if router.is_relay else 'b' - - # parser.Router.consensus_weight is a string??? - router_tuple = (router_type, router.nickname, router.fingerprint, router.is_running, router.time_published, router.orport, router.dirport, int(router.consensus_weight), router.country_code, router.hostname, router.time_of_lookup) + router = Router() + router.parse(line) + + router_tuple = (router.type, router.nickname, router.fingerprint, + router.running, router.time_published, router.orport, + router.dirport, router.consensus_weight, router.country_code, + router.hostname, router.time_of_lookup) # TODO: Determine whether sqlite3 optimizes by remembering # this insert command and not parsing it every time it sees # it. This is mentioned in PEP 249, but we aren't sure where # the PEP says that implementations might optimize in this way, # or might allow users to optimize in this way. - CURSOR.execute(insert_stmt, router_tuple) + CURSOR.execute(summary_insert_stmt, router_tuple) id_num = CURSOR.lastrowid - address_info = (id_num, router.address) - CURSOR.execute('INSERT INTO addresses (id_of_row, address) VALUES (?,?)', address_info) + address_values = (id_num, router.address) + CURSOR.execute(addresses_insert_stmt, address_values) - flags = router.flags - for flag in flags: - flag_info = (id_num, flag) - CURSOR.execute('INSERT INTO flags (id_of_row, flag) VALUES (?,?)', flag_info) + for flag in router.flags: + flag_values = (id_num, flag) + CURSOR.execute(flags_insert_stmt, flag_values) conn.commit() - + logging.info("Table updated") DB_CREATION_TIME = time.time() - return conn - -def freshen_database(): - global FRESHEN_TIMER - - if DB_CREATION_TIME < os.stat(SUMMARY).st_mtime: - update_database() - - FRESHEN_TIMER = threading.Timer( - DB_UPDATE_INTERVAL, freshen_database) + FRESHEN_TIMER = threading.Timer(DB_UPDATE_INTERVAL, update_databases, summary_file) FRESHEN_TIMER.start() def cancel_freshen(): FRESHEN_TIMER.cancel() -def get_database(): +def get_database_conn(): conn = sqlite3.connect(DBNAME) - conn.row_factory = sqlite3.Row return conn -def query_summary_tbl( - running_filter=None, type_filter=None, hex_fingerprint_filter=None, - country_filter=None, search_filter=None, - order_field=None, order_asc=True, offset_value=None, limit_value=None, - fields=('fingerprint',)): - - conn = get_database() +def query_summary_tbl(running_filter=None, type_filter=None, hex_fingerprint_filter=None, + country_filter=None, search_filter=None, order_field=None, + order_asc=True, offset_value=None, limit_value=None, + fields=('fingerprint',)): + conn = get_database_conn() # Build up a WHERE clause based on the request parameters. We only # consider the case in which the client specifies 'search' or @@ -228,86 +232,82 @@ def query_summary_tbl( # Actually, this is a moderately painful parameter to implement. # Testing for an IP address probably means using regular expressions. - # SQLite doesn't suppor them without a user-defined function. + # SQLite doesn't support them without a user-defined function. # Matching against a Python RE is easy to do, but then we have # to have a where clause that matches against the beginning of a # field value, and SQLite doesn't appear to support such a search # (unless, of course, you want to write a user-defined match() # function). - pass else: - if running_filter != None: + if running_filter: clauses.append("running = %s" % int(running_filter)) - if type_filter != None: + if type_filter: clauses.append("type = '%s'" % type_filter) - if hex_fingerprint_filter != None: + if hex_fingerprint_filter: clauses.append("fingerprint = '%s'" % hex_fingerprint_filter) - if country_filter != None: + if country_filter: clauses.append("country = '%s'" % country_filter) where_clause = ('WHERE %s' % ' and '.join(clauses)) if clauses else '' # Construct the ORDER, LIMIT, and OFFSET clauses. order_clause = '' - if order_field != None: - order_clause = 'ORDER BY %s %s' % (order_field, - 'ASC' if order_asc else 'DESC') + if order_field: + order_clause = 'ORDER BY %s %s' % (order_field, + 'ASC' if order_asc else 'DESC') limit_clause = '' - if limit_value != None: + if limit_value: limit_clause = 'LIMIT %s' % limit_value offset_clause = '' - if offset_value != None: + if offset_value: offset_clause = 'OFFSET %s' % offset_value cursor = conn.cursor() - cursor.execute('SELECT %s FROM summary %s %s %s %s' % (','.join(fields), - where_clause, order_clause, limit_clause, offset_clause)) + cursor.execute('SELECT %s FROM summary %s %s %s %s' % + (','.join(fields), where_clause, order_clause, limit_clause, + offset_clause)) return cursor.fetchall() - -def get_summary_routers( - running_filter=None, type_filter=None, hex_fingerprint_filter=None, - country_filter=None, search_filter=None, - order_field=None, order_asc=True, offset_value=None, limit_value=None): +def get_summary_routers(running_filter=None, type_filter=None, hex_fingerprint_filter=None, + country_filter=None, search_filter=None, order_field=None, + order_asc=True, offset_value=None, limit_value=None): """ Get summary document according to request parameters. @rtype: tuple. @return: tuple of form (relays, bridges, relays_time, bridges_time), where - * relays (bridges) is a list of sqlite3.Row, each of which consists of the - various attributes. The important part is that each element of - relays (bridges) can be treated as a dictionary, with keys - the same as the database fields. - * relays_time (bridges_time) is a datetime object with the most - recent timestamp of the relay descriptors in relays. + * relays/bridges is a list of Router objects + * relays_time/bridges_time is a datetime object with the most + recent timestamp of the relay descriptors in relays. """ # Timestamps of most recent relay/bridge in the returned set. relay_timestamp = datetime.datetime(1900, 1, 1, 1, 0) bridge_timestamp = datetime.datetime(1900, 1, 1, 1, 0) - filtered_relays, filtered_bridges = [], [] - fields = ('type', 'nickname', 'fingerprint', 'running', 'country_code', + relays, bridges = [], [] + fields = ('type', 'nickname', 'fingerprint', 'running', 'country_code', 'time_published', 'consensus_weight') - for row in query_summary_tbl( - running_filter, type_filter, hex_fingerprint_filter, - country_filter, search_filter, - order_field, order_asc, offset_value, limit_value, fields): + for row in query_summary_tbl(running_filter, type_filter, hex_fingerprint_filter, + country_filter, search_filter,order_field, order_asc, + offset_value, limit_value, fields): - # Set the destination list for this router. - dest = filtered_relays if row[0] == 'r' else filtered_bridges - dest.append(row) + current_router = datetime.datetime.strptime(row[5], "%Y-%m-%d %H:%M:%S") + router = Router() + + # This is magic + map(lambda (attr, value): setattr(router, attr, value), zip(fields, row)) - current_router = datetime.datetime.strptime(row[5], "%Y-%m-%d %H:%M:%S") if row[0] == 'r': + relays.append(router) if current_router > relay_timestamp: relay_timestamp = current_router if row[0] == 'b': + bridges.append(router) if current_router > bridge_timestamp: bridge_timestamp = current_router - total_routers = (filtered_relays, filtered_bridges, relay_timestamp, bridge_timestamp) + total_routers = (relays, bridges, relay_timestamp, bridge_timestamp) return total_routers - diff --git a/pyonionoo/handlers/summary.py b/pyonionoo/handlers/summary.py index 7260c77..ca12a0f 100644 --- a/pyonionoo/handlers/summary.py +++ b/pyonionoo/handlers/summary.py @@ -35,13 +35,12 @@ class SummaryHandler(cyclone.web.RequestHandler): relays, bridges = [], [] filtered_relays, filtered_bridges, relay_timestamp, bridge_timestamp = routers - for (src, dest) in ((filtered_relays, relays), - (filtered_bridges, bridges)): + for (src, dest) in ((filtered_relays, relays), (filtered_bridges, bridges)): for router in src: dest.append({ - 'n' : router['nickname'], - 'f' : router['fingerprint'], - 'r' : bool(router['running']) + 'n' : router.nickname, + 'f' : router.fingerprint, + 'r' : bool(router.running) }) # response is a dict, so the order is not maintained. should the diff --git a/pyonionoo/parser.py b/pyonionoo/parser.py index e7f27e8..5105782 100644 --- a/pyonionoo/parser.py +++ b/pyonionoo/parser.py @@ -2,7 +2,7 @@ import re import datetime class Router: - def __init__(self, raw_content): + def __init__(self): self.nickname = None self.fingerprint = None self.address = None @@ -13,21 +13,21 @@ class Router: self.orport = None self.dirport = None self.flags = None - self.is_running = False + self.running = False self.consensus_weight = None self.country_code = None self.hostname = None self.time_of_lookup = None - self.is_relay = None - self._parse(raw_content) + self.type = None - def _parse(self, raw_content): + def parse(self, raw_content): values = raw_content.split() if len(values) < 9: #raise Exception raise ValueError("Invalid router!") - if values[0] == "r": - self.is_relay = True + if values[0] == "r": self.type = "r" + else: self.type = "b" + self.nickname = values[1] self.fingerprint = values[2] @@ -51,8 +51,8 @@ class Router: self.flags = values[8].split(',') for flag in self.flags: if flag == "Running": - self.is_running = True - self.consensus_weight = values[9] + self.running = True + self.consensus_weight = int(values[9]) self.country_code = values[10] if values[11] != "null" : self.hostname = values[11] self.time_of_lookup = int(values[12]) diff --git a/pyonionoo/web.py b/pyonionoo/web.py index 72ae9b1..b83cbcd 100644 --- a/pyonionoo/web.py +++ b/pyonionoo/web.py @@ -36,7 +36,7 @@ class Application(cyclone.web.Application): if not settings['metrics_out']: raise ValueError - database.create_database(settings['metrics_out']) + database.bootstrap_database(settings['metrics_out'], settings['summary_file']) cyclone.web.Application.__init__(self, handlers, **settings)

1 0

[pyonionoo/master] Make OFFSET work without a LIMIT
by karsten＠torproject.org 22 Sep '12

22 Sep '12

commit eaefe79fe85ef6b44d33eeddc91fef5720770f9d Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Sat Sep 22 08:45:41 2012 +0530 Make OFFSET work without a LIMIT sqlite doesn't understand OFFSET without a LIMIT clause. Use TOTAL_ROWS-offset_value to find the LIMIT. --- pyonionoo/database.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pyonionoo/database.py b/pyonionoo/database.py index b0aaae8..be70578 100644 --- a/pyonionoo/database.py +++ b/pyonionoo/database.py @@ -30,6 +30,12 @@ DB_UPDATE_INTERVAL = 60 # The timer object used for updating the database. FRESHEN_TIMER = None +# Total number of rows in summary db. This can also be calculated during +# run time by doing "SELECT COUNT(*) FROM summary" but this will take +# time to execute. It seems like a better idea to count the number of rows +# during insertion. +TOTAL_ROWS = 0 + # Database schemas. # Summary database: in conjunction with addresses and flags, holds the # information in the summary document. addresses and flags are lists of @@ -124,7 +130,7 @@ def update_databases(summary_file=None): database. Once this function completes, all future reads will be from the "updated" database. """ - global DB_CREATION_TIME + global DB_CREATION_TIME, TABLE_ROWS if DB_CREATION_TIME >= os.stat(summary_file).st_mtime: return @@ -141,6 +147,7 @@ def update_databases(summary_file=None): CURSOR.execute('DELETE FROM %s' % summary_tbl_name) CURSOR.execute('DELETE FROM %s' % flags_tbl_name) CURSOR.execute('DELETE FROM %s' %addresses_tbl_name) + TABLE_ROWS = 0 # Create the summary database. We could accumulate all the router tuples # and then insert them with an executemany(...) in one go, except that @@ -192,6 +199,7 @@ def update_databases(summary_file=None): # or might allow users to optimize in this way. CURSOR.execute(summary_insert_stmt, router_tuple) id_num = CURSOR.lastrowid + TABLE_ROWS += 1 address_values = (id_num, router.address) CURSOR.execute(addresses_insert_stmt, address_values) @@ -260,9 +268,11 @@ def query_summary_tbl(running_filter=None, type_filter=None, hex_fingerprint_fil limit_clause = 'LIMIT %s' % limit_value offset_clause = '' if offset_value: + if not limit_value: + # sqlite doesn't support OFFSET without a LIMIT clause, this is + # a hack to get around that. + limit_clause = 'LIMIT %s' % (TOTAL_ROWS-int(offset_value)) offset_clause = 'OFFSET %s' % offset_value - - cursor = conn.cursor() cursor.execute('SELECT %s FROM summary %s %s %s %s' % (','.join(fields), where_clause, order_clause, limit_clause, offset_clause))

1 0

[tor/master] add faravahar as our ninth v3 dir auth
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit c88a4c51b4cd2d6d584231a44a6e4ea4ac7396a0 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 09:10:37 2012 -0400 add faravahar as our ninth v3 dir auth --- changes/ticket5749 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/changes/ticket5749 b/changes/ticket5749 new file mode 100644 index 0000000..0237241 --- /dev/null +++ b/changes/ticket5749 @@ -0,0 +1,3 @@ + o New directory authorities: + - Add Faravahar (run by Sina Rabbani) as the ninth v3 directory + authority. Closes ticket 5749. diff --git a/src/or/config.c b/src/or/config.c index b9170f4..90a5dfb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -969,6 +969,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "maatuska orport=80 no-v2 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", + "Faravahar orport=443 no-v2 " + "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " + "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL }; for (i=0; dirservers[i]; i++) {

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit dc014c97472e3adf2306938841c13de0040a2ff0 Merge: a2f57b9 c88a4c5 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 09:31:09 2012 -0400 Merge branch 'maint-0.2.3' changes/ticket5749 | 3 +++ src/or/config.c | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.3] add faravahar as our ninth v3 dir auth
by arma＠torproject.org 22 Sep '12

22 Sep '12

1 0

[tor/master] bump to 0.2.4.3-alpha-dev
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit a2f57b97998b325c059d2fac06ca37d4b4dc52a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 08:09:17 2012 -0400 bump to 0.2.4.3-alpha-dev --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index ea14ad2..4db1a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.3-alpha]) +AC_INIT([tor],[0.2.4.3-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index fca9817..cba8c43 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.3-alpha" +!define VERSION "0.2.4.3-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d49b036..78512c5 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.3-alpha" +#define VERSION "0.2.4.3-alpha-dev"

1 0

[tor/master] 4aff97cfc didn't update the 'last modified' timestamp
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit 622f90904c7511b5451392f0e4f94c1a9dd5a8fb Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 06:11:05 2012 -0400 4aff97cfc didn't update the 'last modified' timestamp --- src/config/torrc.sample.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index f30fc32..c667efc 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 22 April 2012 for Tor 0.2.3.14-alpha. +## Last updated 12 September 2012 for Tor 0.2.4.3-alpha. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines

1 0

[tor/master] bump to 0.2.4.3-alpha
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit 3355976bb472c9a5916b20c83ecdf03a9fde20f6 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 06:11:28 2012 -0400 bump to 0.2.4.3-alpha --- configure.ac | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7f33828..ea14ad2 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl Copyright (c) 2007-2012, The Tor Project, Inc. dnl See LICENSE for licensing information -AC_INIT([tor],[0.2.4.2-alpha-dev]) +AC_INIT([tor],[0.2.4.3-alpha]) AC_CONFIG_SRCDIR([src/or/main.c]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 96e27b4..fca9817 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.4.2-alpha-dev" +!define VERSION "0.2.4.3-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index beebc6d..d49b036 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -232,7 +232,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.4.2-alpha-dev" +#define VERSION "0.2.4.3-alpha"

1 0

[tor/master] fold in changes files
by arma＠torproject.org 22 Sep '12

22 Sep '12

commit e13270446609e745aa163a2d6a4bdb16fa29c578 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Sep 22 06:06:36 2012 -0400 fold in changes files --- ChangeLog | 40 +++++++++++++++++++++++++++++++++++++++- changes/6044 | 5 ----- changes/6884 | 4 ---- changes/bug4020 | 5 ----- changes/bug5809 | 3 --- changes/bug6024 | 2 -- changes/bug6843 | 5 ----- changes/bug6853 | 3 --- changes/bug6861 | 3 --- changes/bug6866 | 9 --------- changes/bug6880 | 3 --- 11 files changed, 39 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ba1286..2413f17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -Changes in version 0.2.4.3-alpha - 2012-09-?? +Changes in version 0.2.4.3-alpha - 2012-09-22 + Tor 0.2.4.3-alpha fixes another opportunity for a remotely triggerable + assertion, resumes letting relays test reachability of their DirPort, + and cleans up a bunch of smaller bugs. + o Security fixes: - Fix an assertion failure in tor_timegm() that could be triggered by a badly formatted directory object. Bug found by fuzzing with @@ -20,11 +24,40 @@ Changes in version 0.2.4.3-alpha - 2012-09-?? part of the loop after it had made its choice slightly slower than it ran through the part of the loop before it had made its choice. Addresses ticket 6538. + - Disable the use of Guard nodes when in Tor2WebMode. Guard usage + by tor2web clients allows hidden services to identity tor2web + clients through their repeated selection of the same rendezvous + and introduction point circuit endpoints (their guards). Resolves + ticket 6888. + + o Minor features: + - Enable Tor to read configuration, state, and key information from + a FIFO. Previously Tor would only read from files with a positive + stat.st_size. Code from meejah; fixes bug 6044. o Minor bugfixes: - Correct file sizes when reading binary files on Cygwin, to avoid a bug where Tor would fail to read its state file. Fixes bug 6844; bugfix on 0.1.2.7-alpha. + - Correctly handle votes with more than 31 flags. Fixes bug 6853; + bugfix on 0.2.0.3-alpha. + - When complaining about a client port on a public address, log + which address we're complaining about. Fixes bug 4020; bugfix on + 0.2.3.3-alpha. Patch by Tom Fitzhenry. + - Convert an assert in the pathbias code to a log message. The assert + appears to only be triggerable by Tor2Web mode. Fixes bug 6866; + bugfix on 0.2.3.17-beta. + - Our new buildsystem was overzealous about rebuilding manpages: it + would rebuild them all whenever any one of them changed. Now our + dependency checking should be correct. Fixes bug 6843; bugfix on + 0.2.4.1-alpha. + - Don't do reachability testing over IPv6 unless AuthDirPublishIPv6 + is set. Fixes bug 6880. Bugfix on 0.2.4.1-alpha. + - Correct log printout about which address family is preferred + when connecting to a bridge with both an IPv4 and IPv6 OR port. + Fixes bug 6884; bugfix on 0.2.4.1-alpha. + + o Minor bugfixes (code cleanliness): - Fix round_to_power_of_2() so it doesn't invoke undefined behavior with large values. This situation was untriggered, but nevertheless incorrect. Fixes bug 6831; bugfix on 0.2.0.1-alpha. @@ -36,6 +69,8 @@ Changes in version 0.2.4.3-alpha - 2012-09-?? Previously, Tor would have confused (as-yet-unused) protocol version numbers greater than 32 with lower ones on many platforms. Fixes bug 6827; bugfix on 0.2.0.10-alpha. Found by George Kadianakis. + - Fix handling of rendezvous client authorization types over 8. + Fixes bug 6861; bugfix on 0.2.1.5-alpha. - Fix building with older versions of GCC (2.95, for one) that don't like preprocessor directives inside macro arguments. Found by grarpamp. Fixes bug 6842; bugfix on 0.2.4.2-alpha. @@ -49,8 +84,11 @@ Changes in version 0.2.4.3-alpha - 2012-09-?? - Move the core of our "choose a weighted element at random" logic into its own function, and give it unit tests. Now the logic is testable, and a little less fragile too. + - Removed the testing_since field of node_t, which hasn't been used + for anything since 0.2.0.9-alpha. o Documentation fixes: + - Clarify that hidden services are TCP only. Fixes bug 6024. - Resolve a typo in torrc.sample.in. Fixes bug 6819; bugfix on 0.2.3.14-alpha. diff --git a/changes/6044 b/changes/6044 deleted file mode 100644 index 6f932a3..0000000 --- a/changes/6044 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Enable Tor to read configuration, state, and key information from - a FIFO. Previously Tor would only read from files with a positive - stat.st_size. Code from meejah; fixes bug 6044. - diff --git a/changes/6884 b/changes/6884 deleted file mode 100644 index 66801db..0000000 --- a/changes/6884 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (client): - - Correct log printout about which address family is preferred - when connecting to a bridge with both an IPv4 and IPv6 OR port. - Fixes bug 6884; bugfix on 0.2.4.1-alpha. diff --git a/changes/bug4020 b/changes/bug4020 deleted file mode 100644 index 3ca86e2..0000000 --- a/changes/bug4020 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - When complaining about a client port on a public address, log - which address we're complaining about. Fixes bug 4020; bugfix on - 0.2.3.3-alpha. Patch by Tom Fitzhenry. - diff --git a/changes/bug5809 b/changes/bug5809 deleted file mode 100644 index ac3f6b1..0000000 --- a/changes/bug5809 +++ /dev/null @@ -1,3 +0,0 @@ - o Removed code: - - Removed the testing_since field of node_t, which hasn't been used - for anything since 0.2.0.9-alpha. diff --git a/changes/bug6024 b/changes/bug6024 deleted file mode 100644 index 743e6ef..0000000 --- a/changes/bug6024 +++ /dev/null @@ -1,2 +0,0 @@ - o Documentation fixes: - - Clarify that hidden services are TCP only. Fixes bug 6024. diff --git a/changes/bug6843 b/changes/bug6843 deleted file mode 100644 index 1acfdbd..0000000 --- a/changes/bug6843 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Our new buildsystem was overzealous about rebuilding manpages: it - would rebuild them all whenever any one of them changed. Now our - dependency checking should be correct. Fixes bug 6843; bugfix on - 0.2.4.1-alpha. diff --git a/changes/bug6853 b/changes/bug6853 deleted file mode 100644 index 382adfb..0000000 --- a/changes/bug6853 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (directory authority): - - Correctly handle votes with more than 31 flags. Fixes bug 6853; - bugfix on 0.2.0.3-alpha. diff --git a/changes/bug6861 b/changes/bug6861 deleted file mode 100644 index 1040bd7..0000000 --- a/changes/bug6861 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Fix handling of rendezvous client authorization types over 8. - Fixes bug 6841; bugfix on 0.2.1.5-alpha. diff --git a/changes/bug6866 b/changes/bug6866 deleted file mode 100644 index efaab98..0000000 --- a/changes/bug6866 +++ /dev/null @@ -1,9 +0,0 @@ - o Minor bugfixes: - - Convert an assert in the pathbias code to a log message. Assert - appears to only be triggerable by Tor2Web mode. Fixes bug 6866; - bugfix on 0.2.3.17-beta. - - Disable the use of Guard nodes when in Tor2WebMode. Guard usage - by Tor2Web clients allows hidden services to identity tor2web - clients through their repeated selection of the same rendezvous - and introduction point circuit endpoints (their guards). Fixes - bug 6888. diff --git a/changes/bug6880 b/changes/bug6880 deleted file mode 100644 index c08a2d4..0000000 --- a/changes/bug6880 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Don't do reachability testing over IPv6 unless - AuthDirPublishIPv6 is set. Fix for bug 6880.

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2012