2c8d2cab13
Merge remote-tracking branch 'teor/bug19699'
2017-03-06 11:52:17 -05:00
0a54e5d148
Fix a function name in a comment. Closes 21580
2017-03-06 11:27:50 -05:00
00d1093daf
Merge branch 'feature21598_squashed'
2017-03-04 23:22:46 -05:00
f24638aa49
Log a message when a hidden service has fewer intro points than expected
...
Closes ticket 21598.
2017-03-04 23:22:34 -05:00
958ec0f5f8
Merge branch 'bug21599_squashed'
2017-03-04 23:16:29 -05:00
684778e705
Simplify hidden service descriptor creation
...
Use an existing flag to check if an introduction point is established.
Cleanup after 21596.
Fixes bug 21599; bugfix on 0.2.7.2-alpha.
2017-03-04 23:15:55 -05:00
fe17955661
Merge remote-tracking branch 'teor/bug21596_030'
2017-03-04 23:10:40 -05:00
3a1cba7d90
Merge branch 'maint-0.3.0'
2017-03-04 20:24:02 -05:00
333d5d0f2a
Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.3.0
2017-03-04 20:23:38 -05:00
c04209c31b
Forward-port changelogs and releaesenotes to master.
...
These are from today's stable releases in 0.2.4 through 0.2.8
2017-03-03 15:00:33 -05:00
3e2d06bd3d
Make hidden services always check for failed intro point connections
...
Previously, they would stop checking when they exceeded their intro point
creation limit.
Fixes bug 21596; bugfix on commit d67bf8b2f2
2017-03-02 15:57:58 +11:00
e0486c9371
Make hidden services always check for failed intro point connections
...
Previously, they would stop checking when they exceeded their intro point
creation limit.
Fixes bug 21596; bugfix on commit d67bf8b2f2
2017-03-02 15:34:45 +11:00
4b5cdb2c30
Fix a crash when a connection tries to open just after it has been unlinked
...
Fixes bug 21576; bugfix on Tor 0.2.9.3-alpha.
Reported by alecmuffett.
2017-03-02 11:10:30 +11:00
9af76a9583
Forward-port 0.3.0.4-rc changelog
2017-03-01 15:39:52 -05:00
bc052d4978
Merge branch 'maint-0.3.0'
...
"ours" to avoid version bump
2017-03-01 15:39:01 -05:00
528dcd113c
Bump to 0.3.0.4-rc-dev
2017-03-01 15:38:36 -05:00
7d3883d084
Merge branch 'maint-0.3.0'
2017-03-01 15:11:23 -05:00
5298ab5917
Restore correct behavior of 0.3.0.4-rc with bridges+ipv6-min
...
In that chutney test, the bridge client is configured to connect to
the same bridge at 127.0.0.1:5003 _and_ at [::1]:5003, with no
change in transports.
That meant, I think, that the descriptor is only assigned to the
first bridge when it arrives, and never the second.
2017-03-01 15:02:16 -05:00
a0a4f8ae5d
Merge remote-tracking branch 'asn/bug21586'
2017-03-01 09:21:34 -05:00
10ccb2bb4b
Master: remove 2 more changes files that are merged in 0.3.0.4-rc
2017-03-01 09:10:54 -05:00
931948ac6a
Prevent SRV assert when called from misconfigured bridge auth.
2017-03-01 15:56:29 +02:00
d8fa6f9ddb
Merge branch 'maint-0.3.0'
2017-03-01 08:54:58 -05:00
18a98206ed
Improve descriptor checks in the new guard algorithm.
...
- Make sure we check at least two guards for descriptor before making
circuits. We typically use the first primary guard for circuits, but
it can also happen that we use the second primary guard (e.g. if we
pick our first primary guard as an exit), so we should make sure we
have descriptors for both of them.
- Remove BUG() from the guard_has_descriptor() check since we now know
that this can happen in rare but legitimate situations as well, and we
should just move to the next guard in that case.
2017-03-01 08:46:53 -05:00
fa6b426999
Merge branch 'maint-0.3.0'
2017-03-01 08:19:45 -05:00
5ff31ff5b3
Merge branch 'maint-0.2.9' into maint-0.3.0
...
"Ours" merge to avoid version bump
2017-03-01 08:19:23 -05:00
75492598b2
Bump to 0.2.9.10-dev
2017-03-01 08:18:54 -05:00
16bddc35ca
Port 0.2.9.10 changelog and releasenotes to master
2017-03-01 08:17:52 -05:00
39d0e0cd0b
Merge branch 'maint-0.3.0'
2017-03-01 07:52:51 -05:00
d784236822
Make test-network.sh always call chutney's test-network.sh
...
Previously, this only worked on systems which had bash installed, due to
some bash-specific code in the script.
Fixes bug 19699; follow-up to 21581.
2017-03-01 13:28:30 +11:00
778d704908
Remove the space before the interpreter name in test-network.sh
...
Apparently some unixes don't like this.
Part of #21581 .
2017-03-01 12:29:52 +11:00
f2ca22f940
Remove the space before the interpreter name in test-network.sh
...
Apparently some unixes don't like this.
Part of #21581 .
2017-03-01 12:28:16 +11:00
8e3d929df7
Merge branch 'maint-0.3.0'
2017-02-28 20:14:06 -05:00
a3bec9aa5a
Remove a spurious test-network-all warning that triggers when sh is not bash
...
Part of 21581.
2017-03-01 11:54:31 +11:00
004ec8dc58
Restore support for test-network.sh on BSD and other systems without bash
...
(But use bash if it's available.)
This is a workaround until we remove bash-specific code in 19699.
Fixes bug 21581; bugfix on 21562, not in any released version of tor.
2017-03-01 11:40:54 +11:00
1cd7a697f1
Merge remote-tracking branch 'teor/bug21510'
2017-02-28 11:43:58 -05:00
aa50758777
Merge remote-tracking branch 'teor/test21470-029'
2017-02-28 11:31:07 -05:00
ef610467fa
Merge remote-tracking branch 'teor/bug21507-029'
2017-02-28 11:19:24 -05:00
242f9b3ffb
Merge remote-tracking branch 'public/bug21407'
2017-02-28 11:17:30 -05:00
9ec08f9899
Merge branch 'maint-0.3.0'
...
This is an "ours" merge to avoid a version bump.
2017-02-28 10:40:34 -05:00
58908b6540
bump version to 0.3.0.4-rc
2017-02-28 10:40:08 -05:00
4128a8cabd
Merge branch 'maint-0.2.9' into maint-0.3.0
...
This is an "ours" merge to avoid a version bump.
2017-02-28 10:39:29 -05:00
b049a5b398
bump version to 0.2.9.10
2017-02-28 10:38:55 -05:00
3e07a54928
Merge branch 'maint-0.2.8' into maint-0.2.9
...
This is an "ours" merge to avoid taking a version bump
2017-02-28 10:38:31 -05:00
f93bcab60e
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
...
This is an "ours" merge to avoid taking a version bump, and to
avoid replaying the post-0.2.7.6 history of "maint-0.2.7-redux" onto maint-0.2.8, which already included the relevant changes.
2017-02-28 10:37:25 -05:00
f2a657c22b
bump version to 0.2.8.13
2017-02-28 10:34:33 -05:00
b5526bef38
Bump version to 0.2.7.7
2017-02-28 10:27:20 -05:00
1174b50cab
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
"ours" merge to avoid version bumps
2017-02-28 10:26:45 -05:00
57e778f882
bump to 0.2.6.11
2017-02-28 10:26:24 -05:00
ccdf0b319c
Merge branch 'maint-0.2.5' into maint-0.2.6
...
"ours" merge to avoid version bumps
2017-02-28 10:25:51 -05:00
884b3717a9
Bump version to 0.2.5.13
2017-02-28 10:23:20 -05:00
Nick Mathewson
teor
George Kadianakis