]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
11 years agoMerge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'
Nick Mathewson [Fri, 31 Oct 2014 12:52:07 +0000 (08:52 -0400)] 
Merge commit '13298d90a90dc62d21d38f910171c9b57a8f0273'

11 years agoTeach format_changelog.py --blog about drupal <!--break-->
Nick Mathewson [Thu, 30 Oct 2014 21:08:42 +0000 (17:08 -0400)] 
Teach format_changelog.py --blog about drupal <!--break-->

11 years agoTwiddle the format_changelog.py option defaults.
Nick Mathewson [Thu, 30 Oct 2014 20:54:10 +0000 (16:54 -0400)] 
Twiddle the format_changelog.py option defaults.

11 years agoNew empty changelog section
Nick Mathewson [Thu, 30 Oct 2014 17:56:36 +0000 (13:56 -0400)] 
New empty changelog section

11 years agoBump version to 0.2.6.1-alpha-dev
Nick Mathewson [Thu, 30 Oct 2014 14:25:24 +0000 (10:25 -0400)] 
Bump version to 0.2.6.1-alpha-dev

11 years agoClarify 13476 changelog (From sebastian) tor-0.2.6.1-alpha
Nick Mathewson [Thu, 30 Oct 2014 13:56:40 +0000 (09:56 -0400)] 
Clarify 13476 changelog (From sebastian)

11 years agoFix a typo in the ChangeLog, spotted by Yawning
Nick Mathewson [Thu, 30 Oct 2014 13:52:36 +0000 (09:52 -0400)] 
Fix a typo in the ChangeLog, spotted by Yawning

11 years agoBump version to 0.2.6.1-alpha
Nick Mathewson [Thu, 30 Oct 2014 12:58:58 +0000 (08:58 -0400)] 
Bump version to 0.2.6.1-alpha

11 years agoFinal(?) tweaks to 0.2.6.1-alpha changelog
Nick Mathewson [Thu, 30 Oct 2014 12:54:44 +0000 (08:54 -0400)] 
Final(?) tweaks to 0.2.6.1-alpha changelog

11 years agoSilence spurious clang warnings
teor [Sun, 26 Oct 2014 03:43:55 +0000 (14:43 +1100)] 
Silence spurious clang warnings

Silence clang warnings under --enable-expensive-hardening, including:
  + implicit truncation of 64 bit values to 32 bit;
  + const char assignment to self;
  + tautological compare; and
  + additional parentheses around equality tests. (gcc uses these to
    silence assignment, so clang warns when they're present in an
    equality test. But we need to use extra parentheses in macros to
    isolate them from other code).

11 years agoMake 0.2.6.1-alpha ChangeLog prettier.
George Kadianakis [Wed, 29 Oct 2014 17:26:26 +0000 (17:26 +0000)] 
Make 0.2.6.1-alpha ChangeLog prettier.

11 years agoAdd a draft blurb for 0.2.6.1-alpha
Nick Mathewson [Wed, 29 Oct 2014 14:24:13 +0000 (10:24 -0400)] 
Add a draft blurb for 0.2.6.1-alpha

11 years agoReinvoke format_changelog.py
Nick Mathewson [Wed, 29 Oct 2014 14:19:10 +0000 (10:19 -0400)] 
Reinvoke format_changelog.py

Also, tweak it so that it puts major deprecations and requirements
early in the changelog.

11 years agoa few more style fixes for the changelog
Nick Mathewson [Wed, 29 Oct 2014 14:18:48 +0000 (10:18 -0400)] 
a few more style fixes for the changelog

11 years agoEdit changelog entries for terseness and style.
Nick Mathewson [Wed, 29 Oct 2014 14:17:27 +0000 (10:17 -0400)] 
Edit changelog entries for terseness and style.

11 years agoAdd in a few more changes entries for 0.2.6.1-alpha
Nick Mathewson [Wed, 29 Oct 2014 13:06:55 +0000 (09:06 -0400)] 
Add in a few more changes entries for 0.2.6.1-alpha

(Also resort and rewrap)

11 years agoTrack down "bugfix on version" entries for 0.2.6.1-alpha changelog
Nick Mathewson [Wed, 29 Oct 2014 12:50:13 +0000 (08:50 -0400)] 
Track down "bugfix on version" entries for 0.2.6.1-alpha changelog

11 years agoAdd another year to our copyright dates.
Nick Mathewson [Tue, 28 Oct 2014 19:28:14 +0000 (15:28 -0400)] 
Add another year to our copyright dates.

Because in 95 years, we or our successors will surely care about
enforcing the BSD license terms on this code.  Right?

11 years agoAdding changes file for 9708.
rl1987 [Sun, 26 Oct 2014 17:48:22 +0000 (19:48 +0200)] 
Adding changes file for 9708.

11 years agoInitial version of doc/TUNING.
rl1987 [Sun, 26 Oct 2014 17:37:48 +0000 (19:37 +0200)] 
Initial version of doc/TUNING.

11 years agoUpdating message that warns about running out of sockets we can use.
rl1987 [Sun, 26 Oct 2014 14:45:15 +0000 (16:45 +0200)] 
Updating message that warns about running out of sockets we can use.

11 years agoFix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag.
rl1987 [Sun, 26 Oct 2014 18:56:15 +0000 (20:56 +0200)] 
Fix smartlist_choose_node_by_bandwidth() so that it rejects ORs with BadExit flag.

11 years agoMerge remote-tracking branch 'rl1987/feature10427'
Nick Mathewson [Tue, 28 Oct 2014 18:03:40 +0000 (14:03 -0400)] 
Merge remote-tracking branch 'rl1987/feature10427'

11 years agoMerge remote-tracking branch 'sebastian/bug13286'
Nick Mathewson [Mon, 27 Oct 2014 16:12:16 +0000 (12:12 -0400)] 
Merge remote-tracking branch 'sebastian/bug13286'

11 years agoStart on an 0.2.6.1-alpha changelog
Nick Mathewson [Mon, 27 Oct 2014 15:27:52 +0000 (11:27 -0400)] 
Start on an 0.2.6.1-alpha changelog

I concatenated the remaining changes/* files, removed them, made the
headings more uniform, then told format_changelog.py to sort,
collate, and wrap them.

11 years agoRemove changes files that have already been merged in release-0.2.5
Nick Mathewson [Mon, 27 Oct 2014 15:09:41 +0000 (11:09 -0400)] 
Remove changes files that have already been merged in release-0.2.5

(This means that changes/* is now "everything that changed since
0.2.5.10".)

11 years agoTeach format_changelog.py to emit HTML.
Nick Mathewson [Mon, 27 Oct 2014 14:32:25 +0000 (10:32 -0400)] 
Teach format_changelog.py to emit HTML.

11 years agoRemove configure option to disable curve25519
Sebastian Hahn [Mon, 27 Oct 2014 13:37:50 +0000 (14:37 +0100)] 
Remove configure option to disable curve25519

By now, support in the network is widespread and it's time to require
more modern crypto on all Tor instances, whether they're clients or
servers. By doing this early in 0.2.6, we can be sure that at some point
all clients will have reasonable support.

11 years agoCongratulate relay operator when OR is first started
rl1987 [Sun, 26 Oct 2014 19:51:35 +0000 (21:51 +0200)] 
Congratulate relay operator when OR is first started

When Tor first generates identity keypair, emit a log message that
thanks for their participation and points to new Tor relay lifecycle
document.

11 years agoFix a crash bug introduced in 223d354e3.
Nick Mathewson [Sun, 26 Oct 2014 18:09:03 +0000 (14:09 -0400)] 
Fix a crash bug introduced in 223d354e3.

Arma found this and commented on #11243.  Bug not in any released
version of Tor.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Fri, 24 Oct 2014 13:23:53 +0000 (09:23 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

11 years agobump version to 0.2.5.10-dev
Nick Mathewson [Fri, 24 Oct 2014 13:22:58 +0000 (09:22 -0400)] 
bump version to 0.2.5.10-dev

11 years agoForward-port changelog and release notes for 0.2.5.10
Nick Mathewson [Fri, 24 Oct 2014 13:21:40 +0000 (09:21 -0400)] 
Forward-port changelog and release notes for 0.2.5.10

11 years agoSwitch new time tests to use SIZEOF_TIME_T, not sizeof(time_t)
Nick Mathewson [Wed, 22 Oct 2014 16:57:21 +0000 (12:57 -0400)] 
Switch new time tests to use SIZEOF_TIME_T, not sizeof(time_t)

Otherwise, we get implicit conversion warning on some platforms.

11 years agoFix minor typos, two line lengths, and a repeated include
teor [Wed, 22 Oct 2014 15:35:46 +0000 (02:35 +1100)] 
Fix minor typos, two line lengths, and a repeated include

11 years agoFix a changes typo spotted by wfn
Nick Mathewson [Wed, 22 Oct 2014 15:02:56 +0000 (11:02 -0400)] 
Fix a changes typo spotted by wfn

11 years agoMerge remote-tracking branch 'public/bug11824_v2'
Nick Mathewson [Wed, 22 Oct 2014 15:01:50 +0000 (11:01 -0400)] 
Merge remote-tracking branch 'public/bug11824_v2'

11 years agoMerge remote-tracking branch 'public/ticket6938'
Nick Mathewson [Wed, 22 Oct 2014 14:14:03 +0000 (10:14 -0400)] 
Merge remote-tracking branch 'public/ticket6938'

Conflicts:
src/tools/tor-resolve.c

11 years agogive dist-master an alias
Roger Dingledine [Tue, 21 Oct 2014 20:01:29 +0000 (16:01 -0400)] 
give dist-master an alias

11 years agoMerge remote-tracking branch 'teor/bug13476-improve-time-handling'
Nick Mathewson [Tue, 21 Oct 2014 17:14:27 +0000 (13:14 -0400)] 
Merge remote-tracking branch 'teor/bug13476-improve-time-handling'

11 years agoConditionally compile time testing code based on integer size
teor [Mon, 20 Oct 2014 21:44:10 +0000 (08:44 +1100)] 
Conditionally compile time testing code based on integer size

11 years agoMerge remote-tracking branch 'teor/memwipe-more-keys'
Nick Mathewson [Mon, 20 Oct 2014 15:12:51 +0000 (11:12 -0400)] 
Merge remote-tracking branch 'teor/memwipe-more-keys'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Mon, 20 Oct 2014 14:33:53 +0000 (10:33 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

This is an "ours" merge so we can leave the version in master alone.

11 years agobump maint-0.2.5 to 0.2.5.9-rc-dev
Nick Mathewson [Mon, 20 Oct 2014 14:32:09 +0000 (10:32 -0400)] 
bump maint-0.2.5 to 0.2.5.9-rc-dev

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Mon, 20 Oct 2014 14:31:20 +0000 (10:31 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

11 years agoWhoops, bump the version properly.
Nick Mathewson [Mon, 20 Oct 2014 14:29:16 +0000 (10:29 -0400)] 
Whoops, bump the version properly.

11 years agobump maint-0.2.4 to 0.2.4.25-dev
Nick Mathewson [Mon, 20 Oct 2014 14:24:21 +0000 (10:24 -0400)] 
bump maint-0.2.4 to 0.2.4.25-dev

11 years agoforward-port the 0.2.4.25 changelog to master changelog and releasenotes
Nick Mathewson [Mon, 20 Oct 2014 14:01:07 +0000 (10:01 -0400)] 
forward-port the 0.2.4.25 changelog to master changelog and releasenotes

11 years agoUse a macro to indicate "The ecdhe group we use by default".
Nick Mathewson [Mon, 20 Oct 2014 13:08:42 +0000 (09:08 -0400)] 
Use a macro to indicate "The ecdhe group we use by default".

This might make Coverity happier about the if statement where we
have a default case that's the same as one of the other cases. CID 1248515

11 years agoFix a use-after-free error in cleaned-up rouerlist code.
Nick Mathewson [Mon, 20 Oct 2014 13:04:53 +0000 (09:04 -0400)] 
Fix a use-after-free error in cleaned-up rouerlist code.

Bug not in any released tor.  This is CID 1248521

11 years agoexplain how to publish tarballs now that webwml has gone to git
Roger Dingledine [Mon, 20 Oct 2014 01:27:41 +0000 (21:27 -0400)] 
explain how to publish tarballs now that webwml has gone to git

11 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Sun, 19 Oct 2014 19:40:25 +0000 (15:40 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Sun, 19 Oct 2014 19:40:07 +0000 (15:40 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Sun, 19 Oct 2014 19:39:48 +0000 (15:39 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoNote that our #13426 fix is also a #13471 fix.
Nick Mathewson [Sun, 19 Oct 2014 19:38:44 +0000 (15:38 -0400)] 
Note that our #13426 fix is also a #13471 fix.

See also http://marc.info/?l=openssl-dev&m=141357408522028&w=2

11 years agoformat_changelog: Sort sections case-insensitively
Nick Mathewson [Sun, 19 Oct 2014 18:19:22 +0000 (14:19 -0400)] 
format_changelog: Sort sections case-insensitively

11 years agoformat_changelog.py: fix spelling of "hyphenatable"
Nick Mathewson [Sun, 19 Oct 2014 16:59:17 +0000 (12:59 -0400)] 
format_changelog.py: fix spelling of "hyphenatable"

11 years agoformat_changelog.py: tweak hyphenation rules
Nick Mathewson [Sun, 19 Oct 2014 16:57:57 +0000 (12:57 -0400)] 
format_changelog.py: tweak hyphenation rules

Mark all our generated command names, and anything with a
double-hyphen, as unhyphenatable.

11 years agoTeach format_changelog to sort and collate sections.
Nick Mathewson [Sun, 19 Oct 2014 16:44:19 +0000 (12:44 -0400)] 
Teach format_changelog to sort and collate sections.

Give it options to turn off collation and/or wrapping.

11 years agoMemwipe more keys after tor has finished with them
teor [Sun, 19 Oct 2014 16:06:28 +0000 (03:06 +1100)] 
Memwipe more keys after tor has finished with them

Ensure we securely wipe keys from memory after
crypto_digest_get_digest and init_curve25519_keypair_from_file
have finished using them.

Fixes bug 13477.

11 years agoFurther unit test tor_timegm and parse_rfc1123_time
teor [Sun, 19 Oct 2014 15:52:21 +0000 (02:52 +1100)] 
Further unit test tor_timegm and parse_rfc1123_time

Add unit tests for tor_timegm signed overflow,
tor_timegm and parse_rfc1123_time validity checks,
and correct_tm year clamping.
Unit tests (visible) fixes in bug 13476.

11 years agoClamp (some) years supplied by the system to 1 CE
teor [Sun, 19 Oct 2014 15:47:31 +0000 (02:47 +1100)] 
Clamp (some) years supplied by the system to 1 CE

Clamp year values returned by system localtime(_r) and
gmtime(_r) to year 1. This ensures tor can read any
values it might write out.

Fixes bug 13476.

11 years agoformat_changelog.py: learn about the ReleaseNotes format
Nick Mathewson [Sun, 19 Oct 2014 15:47:16 +0000 (11:47 -0400)] 
format_changelog.py: learn about the ReleaseNotes format

11 years agoImprove date validation in HTTP headers
teor [Sun, 19 Oct 2014 15:40:27 +0000 (02:40 +1100)] 
Improve date validation in HTTP headers

Check all date/time values passed to tor_timegm
and parse_rfc1123_time for validity, taking leap
years into account.
Improves HTTP header validation.

Avoid unlikely signed integer overflow in tor_timegm
on systems with 32-bit time_t.
Fixes bug 13476.

11 years agoUse correct day of year in correct_tm()
teor [Sun, 19 Oct 2014 15:32:05 +0000 (02:32 +1100)] 
Use correct day of year in correct_tm()

Set the correct day of year value in correct_tm() when the
system's localtime(_r) or gmtime(_r) functions fail to set struct tm.

Fixes bug 13476.

11 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Thu, 16 Oct 2014 17:29:14 +0000 (13:29 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

11 years agoDowngrade 'unexpected sendme cell from client' to PROTOCOL_WARN
Nick Mathewson [Thu, 16 Oct 2014 17:04:11 +0000 (13:04 -0400)] 
Downgrade 'unexpected sendme cell from client' to PROTOCOL_WARN

Closes 8093.

11 years agoMerge remote-tracking branch 'yawning/bug13314'
Nick Mathewson [Thu, 16 Oct 2014 13:12:13 +0000 (09:12 -0400)] 
Merge remote-tracking branch 'yawning/bug13314'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.5'
Nick Mathewson [Thu, 16 Oct 2014 13:09:20 +0000 (09:09 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.5'

11 years agoMerge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Nick Mathewson [Thu, 16 Oct 2014 13:08:52 +0000 (09:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

11 years agoMerge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Nick Mathewson [Thu, 16 Oct 2014 13:08:32 +0000 (09:08 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

11 years agoMerge branch 'no_sslv3_023' into maint-0.2.3
Nick Mathewson [Thu, 16 Oct 2014 13:08:09 +0000 (09:08 -0400)] 
Merge branch 'no_sslv3_023' into maint-0.2.3

11 years agoDisable SSLv3 unconditionally. Closes ticket 13426.
Nick Mathewson [Wed, 15 Oct 2014 15:50:05 +0000 (11:50 -0400)] 
Disable SSLv3 unconditionally. Closes ticket 13426.

The POODLE attack doesn't affect Tor, but there's no reason to tempt
fate: SSLv3 isn't going to get any better.

11 years agoEmit fewer spurious lines in cov-diff output.
Nick Mathewson [Tue, 14 Oct 2014 13:41:40 +0000 (09:41 -0400)] 
Emit fewer spurious lines in cov-diff output.

11 years agoDefine a strnlen replacement on platforms (win32) that lack it
Nick Mathewson [Mon, 13 Oct 2014 18:59:17 +0000 (14:59 -0400)] 
Define a strnlen replacement on platforms (win32) that lack it

Right now this is only needed for test_util_format_time_interval, so
define it as a static function.  We can move it into compat later if
we need to.

11 years agoMerge remote-tracking branch 'public/bug11243_squashed'
Nick Mathewson [Mon, 13 Oct 2014 18:32:43 +0000 (14:32 -0400)] 
Merge remote-tracking branch 'public/bug11243_squashed'

11 years agoAdd comments to can_dl_again usage
Nick Mathewson [Mon, 13 Oct 2014 18:22:52 +0000 (14:22 -0400)] 
Add comments to can_dl_again usage

11 years agoNote that parse-list functions may add duplicate 'invalid' entries.
Nick Mathewson [Mon, 13 Oct 2014 18:15:56 +0000 (14:15 -0400)] 
Note that parse-list functions may add duplicate 'invalid' entries.

11 years agoBugfixes on bug11243 fix for the not-added cases and tests
Nick Mathewson [Mon, 13 Oct 2014 18:11:27 +0000 (14:11 -0400)] 
Bugfixes on bug11243 fix for the not-added cases and tests

 1. The test that adds things to the cache needs to set the clock back so
    that the descriptors it adds are valid.

 2. We split ROUTER_NOT_NEW into ROUTER_TOO_OLD, so that we can
    distinguish "already had it" from "rejected because of old published
    date".

 3. We make extrainfo_insert() return a was_router_added_t, and we
    make its caller use it correctly.  This is probably redundant with
    the extrainfo_is_bogus flag.

11 years agoUse symbolic constants for statuses in microdescs_add_to_cache.
Nick Mathewson [Mon, 13 Oct 2014 17:43:07 +0000 (13:43 -0400)] 
Use symbolic constants for statuses in microdescs_add_to_cache.

Suggested by Andrea in her review of 11243.

11 years agoCommit the script I used to generate signed ri and ei documents
Nick Mathewson [Tue, 7 Oct 2014 16:36:45 +0000 (12:36 -0400)] 
Commit the script I used to generate signed ri and ei documents

11 years agoDon't reset the download failure status of any object marked as impossible
Nick Mathewson [Tue, 7 Oct 2014 13:34:28 +0000 (09:34 -0400)] 
Don't reset the download failure status of any object marked as impossible

11 years agoUnit tests for 11243: loading ri, ei, mds from lists
Nick Mathewson [Tue, 7 Oct 2014 13:20:44 +0000 (09:20 -0400)] 
Unit tests for 11243: loading ri, ei, mds from lists

These tests make sure that entries are actually marked
undownloadable as appropriate.

11 years agoBase tests for 11243: test parsing for md, ei, and ri.
Nick Mathewson [Mon, 6 Oct 2014 13:06:04 +0000 (09:06 -0400)] 
Base tests for 11243: test parsing for md, ei, and ri.

We didn't really have test coverage for these parsing functions, so
I went and made some.  These tests also verify that the parsing
functions set the list of invalid digests correctly.

11 years agoTreat unparseable (micro)descriptors and extrainfos as undownloadable
Nick Mathewson [Fri, 3 Oct 2014 14:55:50 +0000 (10:55 -0400)] 
Treat unparseable (micro)descriptors and extrainfos as undownloadable

One pain point in evolving the Tor design and implementing has been
adding code that makes clients reject directory documents that they
previously would have accepted, if those descriptors actually exist.
When this happened, the clients would get the document, reject it,
and then decide to try downloading it again, ad infinitum.  This
problem becomes particularly obnoxious with authorities, since if
some authorities accept a descriptor that others don't, the ones
that don't accept it would go crazy trying to re-fetch it over and
over. (See for example ticket #9286.)

This patch tries to solve this problem by tracking, if a descriptor
isn't parseable, what its digest was, and whether it is invalid
because of some flaw that applies to the portion containing the
digest.  (This excludes RSA signature problems: RSA signatures
aren't included in the digest.  This means that a directory
authority can still put another directory authority into a loop by
mentioning a descriptor, and then serving that descriptor with an
invalid RSA signatures.  But that would also make the misbehaving
directory authority get DoSed by the server it's attacking, so it's
not much of an issue.)

We already have a mechanism to mark something undownloadable with
downloadstatus_mark_impossible(); we use that here for
microdescriptors, extrainfos, and router descriptors.

Unit tests to follow in another patch.

Closes ticket #11243.

11 years agoMerge remote-tracking branch 'isis/bug12951_r1'
Nick Mathewson [Mon, 13 Oct 2014 17:22:10 +0000 (13:22 -0400)] 
Merge remote-tracking branch 'isis/bug12951_r1'

11 years agoClean whitespace in last patch.
Nick Mathewson [Mon, 13 Oct 2014 17:20:07 +0000 (13:20 -0400)] 
Clean whitespace in last patch.

11 years agoAvoid overflow in format_time_interval, create unit tests
teor [Sun, 12 Oct 2014 09:50:10 +0000 (20:50 +1100)] 
Avoid overflow in format_time_interval, create unit tests

Fix an instance of integer overflow in format_time_interval() when
taking the absolute value of the supplied signed interval value.
Fixes bug 13393.

Create unit tests for format_time_interval().

11 years agoupdate pointer to faq entry
Roger Dingledine [Sat, 11 Oct 2014 00:16:32 +0000 (20:16 -0400)] 
update pointer to faq entry

11 years agoRemove is_router_version_good_for_possible_guard()
Nick Mathewson [Thu, 9 Oct 2014 19:12:36 +0000 (15:12 -0400)] 
Remove is_router_version_good_for_possible_guard()

The versions which this function would keep from getting the guard
flag are already blocked by the minimum version check.

Closes 13152.

11 years agoMerge remote-tracking branch 'public/bug10816'
Nick Mathewson [Thu, 9 Oct 2014 14:57:19 +0000 (10:57 -0400)] 
Merge remote-tracking branch 'public/bug10816'

11 years agoMerge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed'
Nick Mathewson [Thu, 9 Oct 2014 14:55:09 +0000 (10:55 -0400)] 
Merge remote-tracking branch 'teor/bug-13163-AlternateAuthorities-type-handling-fixed'

11 years agoMerge remote-tracking branches 'teor/issue-13161-test-network' and 'teor/issue-13161...
Nick Mathewson [Wed, 8 Oct 2014 19:46:29 +0000 (15:46 -0400)] 
Merge remote-tracking branches 'teor/issue-13161-test-network' and 'teor/issue-13161-TestingDirAuthVoteExit'

11 years agoMerge remote-tracking branch 'teor/test-network-hang-on-make-j2'
Nick Mathewson [Wed, 8 Oct 2014 19:42:20 +0000 (15:42 -0400)] 
Merge remote-tracking branch 'teor/test-network-hang-on-make-j2'

11 years agoBitwise check BRIDGE_DIRINFO
teor [Wed, 1 Oct 2014 09:04:04 +0000 (19:04 +1000)] 
Bitwise check BRIDGE_DIRINFO

Bitwise check for the BRIDGE_DIRINFO flag, rather than checking for
equality.

Fixes a (potential) bug where directories offering BRIDGE_DIRINFO,
and some other flag (i.e. microdescriptors or extrainfo),
would be ignored when looking for bridge directories.

Final fix in series for bug 13163.

11 years agoImprove DIRINFO flags' usage comments
teor [Wed, 1 Oct 2014 08:54:26 +0000 (18:54 +1000)] 
Improve DIRINFO flags' usage comments

Document usage of the NO_DIRINFO and ALL_DIRINFO flags clearly in functions
which take them as arguments. Replace 0 with NO_DIRINFO in a function call
for clarity.

Seeks to prevent future issues like 13163.

11 years agoStop using default authorities with both Alternate Dir and Bridge Authority
teor [Wed, 1 Oct 2014 08:37:19 +0000 (18:37 +1000)] 
Stop using default authorities with both Alternate Dir and Bridge Authority

Stop using the default authorities in networks which provide both
AlternateDirAuthority and AlternateBridgeAuthority.

This bug occurred due to an ambiguity around the use of NO_DIRINFO.
(Does it mean "any" or "none"?)

Partially fixes bug 13163.

11 years agoExit test-network with status of chutney verify
teor [Sat, 4 Oct 2014 22:59:27 +0000 (09:59 +1100)] 
Exit test-network with status of chutney verify

Preserve previous semantics of src/test/test-network.sh by exiting with
the exit status of chutney verify, even though the latest version ends
with chutney stop.

11 years agofix some typos in the man page
Roger Dingledine [Sat, 4 Oct 2014 19:41:05 +0000 (15:41 -0400)] 
fix some typos in the man page

11 years agoStop an apparent test-network hang when used with make -j2
teor [Sat, 4 Oct 2014 03:18:56 +0000 (13:18 +1000)] 
Stop an apparent test-network hang when used with make -j2

If (GNU) Make 3.81 is running processes in parallel using -j2 (or more),
it waits until all descendent processes have exited before it returns to
the shell.

When a command like "make -j2 test-network" is run, this means that
test-network.sh apparently hangs until it either make is forcibly
terminated, or all the chutney-launched tor processes have exited.

A workaround is to use make without -j, or make -j1 if there is an
existing alias to "make -jn" in the shell.

We resolve this bug in tor by using "chutney stop" after "chutney verify"
in test-network.sh.