]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
6 years agodircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
teor [Tue, 26 Mar 2019 08:12:16 +0000 (18:12 +1000)] 
dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()

Implements ticket 29897.

6 years agoAdd changes file
rl1987 [Sat, 9 Feb 2019 14:56:54 +0000 (16:56 +0200)] 
Add changes file

6 years agoAdd connection_dir_buf_add() helper function
rl1987 [Sat, 9 Feb 2019 14:06:32 +0000 (16:06 +0200)] 
Add connection_dir_buf_add() helper function

6 years agoMerge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
teor [Wed, 27 Mar 2019 02:31:07 +0000 (12:31 +1000)] 
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Wed, 27 Mar 2019 00:02:47 +0000 (10:02 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Wed, 27 Mar 2019 00:02:40 +0000 (10:02 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
teor [Wed, 27 Mar 2019 00:01:45 +0000 (10:01 +1000)] 
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
teor [Tue, 26 Mar 2019 23:36:26 +0000 (09:36 +1000)] 
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0

6 years agoMerge branch 'tor-github/pr/847' into maint-0.4.0
George Kadianakis [Tue, 26 Mar 2019 13:16:21 +0000 (15:16 +0200)] 
Merge branch 'tor-github/pr/847' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
teor [Tue, 26 Mar 2019 09:15:46 +0000 (19:15 +1000)] 
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0

6 years agochanges: add file for #21377
juga0 [Fri, 21 Dec 2018 17:10:19 +0000 (17:10 +0000)] 
changes: add file for #21377

6 years agodircache: fix identation and remove unneded goto
juga0 [Mon, 19 Nov 2018 17:27:41 +0000 (17:27 +0000)] 
dircache: fix identation and remove unneded goto

6 years agobwauth: remove declaring args, they are now in use
juga0 [Thu, 8 Nov 2018 09:13:54 +0000 (09:13 +0000)] 
bwauth: remove declaring args, they are now in use

6 years agotest: check that .../bandwidth.z is compressed
juga0 [Wed, 7 Nov 2018 12:40:51 +0000 (12:40 +0000)] 
test: check that .../bandwidth.z is compressed

6 years agotest: Check bw file cache lifetime
juga0 [Wed, 7 Nov 2018 12:38:45 +0000 (12:38 +0000)] 
test: Check bw file cache lifetime

6 years agobwauth: increment bw file cache lifetime
juga0 [Wed, 7 Nov 2018 12:19:20 +0000 (12:19 +0000)] 
bwauth: increment bw file cache lifetime

Increment bw file cache lifetime when serving it by HTTP.
And add a constant to define that lifetime.

6 years agobwauth: check and use compression serving bw file
juga0 [Wed, 7 Nov 2018 12:15:31 +0000 (12:15 +0000)] 
bwauth: check and use compression serving bw file

6 years agobwauth: check if a bw file could be read
juga0 [Wed, 7 Nov 2018 12:04:09 +0000 (12:04 +0000)] 
bwauth: check if a bw file could be read

Before serving it by HTTP.

6 years agobwauth: use flag to do not warn when file is missing
juga0 [Wed, 7 Nov 2018 08:49:51 +0000 (08:49 +0000)] 
bwauth: use flag to do not warn when file is missing

Use flag to do not warn when the bandwidth file is missing trying
to serve it by http.
Also remove double space in the assignement.

6 years agoServe bandwidth file used in the next vote
juga0 [Fri, 2 Nov 2018 18:38:46 +0000 (18:38 +0000)] 
Serve bandwidth file used in the next vote

When a directory authority is using a bandwidth file to obtain the
bandwidth values that will be included in the next vote, serve this
bandwidth file at /tor/status-vote/next/bandwidth.z.

6 years agoMerge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
teor [Tue, 26 Mar 2019 06:56:45 +0000 (16:56 +1000)] 
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0

6 years agoFix CID 1444119
rl1987 [Wed, 20 Mar 2019 17:44:54 +0000 (19:44 +0200)] 
Fix CID 1444119

Let's use the same function exit point for BUG() codepath that we're using
for every other exit condition. That way, we're not forgetting to clean up
the memarea.

6 years agotest/dir: add a 4th argument to dirserv_read_measured_bandwidths()
teor [Thu, 21 Mar 2019 13:35:56 +0000 (23:35 +1000)] 
test/dir: add a 4th argument to dirserv_read_measured_bandwidths()

Part of 29806.

6 years agoMerge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
teor [Tue, 26 Mar 2019 01:48:52 +0000 (11:48 +1000)] 
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged

6 years agoCorrectly report PT vs proxy during bootstrap
Taylor Yu [Thu, 21 Mar 2019 01:51:12 +0000 (20:51 -0500)] 
Correctly report PT vs proxy during bootstrap

Previously, or_connection_t did not record whether or not the
connection uses a pluggable transport. Instead, it stored the
underlying proxy protocol of the pluggable transport in
proxy_type. This made bootstrap reporting treat pluggable transport
connections as plain proxy connections.

Store a separate bit indicating whether a pluggable transport is in
use, and decode this during bootstrap reporting.

Fixes bug 28925; bugfix on 0.4.0.1-alpha.

6 years agoPass NULL to lpApplicationName in CreateProcessA().
Alexander Færøy [Mon, 25 Mar 2019 02:00:53 +0000 (03:00 +0100)] 
Pass NULL to lpApplicationName in CreateProcessA().

When NULL is given to lpApplicationName we enable Windows' "magical"
path interpretation logic, which makes Tor 0.4.x behave in the same way
as previous Tor versions did when it comes to executing binaries in
different system paths.

For more information about this have a look at the CreateProcessA()
documentation on MSDN -- especially the string interpretation example is
useful to understand this issue.

This bug was introduced in commit bfb94dd2ca8.

See: https://bugs.torproject.org/29874

6 years agoBump to 0.4.0.3-alpha-dev
Nick Mathewson [Sat, 23 Mar 2019 12:44:36 +0000 (08:44 -0400)] 
Bump to 0.4.0.3-alpha-dev

6 years agoMerge branch 'bug29693_040_radical_squashed' into maint-0.4.0
Nick Mathewson [Fri, 22 Mar 2019 15:17:01 +0000 (11:17 -0400)] 
Merge branch 'bug29693_040_radical_squashed' into maint-0.4.0

6 years agoprob-distr: Decrease false positive rate of stochastic tests.
George Kadianakis [Thu, 21 Mar 2019 14:49:56 +0000 (16:49 +0200)] 
prob-distr: Decrease false positive rate of stochastic tests.

6 years agoBump version to 0.4.0.3-alpha
Nick Mathewson [Thu, 21 Mar 2019 13:36:19 +0000 (09:36 -0400)] 
Bump version to 0.4.0.3-alpha

6 years agotest/dir: add an extra argument to dirserv_read_measured_bandwidths()
teor [Thu, 21 Mar 2019 02:56:28 +0000 (12:56 +1000)] 
test/dir: add an extra argument to dirserv_read_measured_bandwidths()

Part of 29806.

6 years agoMerge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_merged
teor [Thu, 21 Mar 2019 02:04:30 +0000 (12:04 +1000)] 
Merge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_merged

Copy and paste the vote=0 code from the old src/or/dirserv.c
to the new src/feature/dirauth/bwauth.c.

6 years agobwauth: Ignore bandwidth file lines with "vote=0"
juga0 [Tue, 19 Mar 2019 11:48:42 +0000 (11:48 +0000)] 
bwauth: Ignore bandwidth file lines with "vote=0"

so that the relays that would be "excluded" from the bandwidth
file because of something failed can be included to diagnose what
failed, without still including these relays in the bandwidth
authorities vote.

Closes #29806.

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Tue, 19 Mar 2019 23:48:12 +0000 (09:48 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Tue, 19 Mar 2019 23:48:03 +0000 (09:48 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
teor [Tue, 19 Mar 2019 23:47:55 +0000 (09:47 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5
teor [Tue, 19 Mar 2019 23:47:31 +0000 (09:47 +1000)] 
Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5

6 years agoMerge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9
teor [Tue, 19 Mar 2019 23:46:10 +0000 (09:46 +1000)] 
Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
Nick Mathewson [Tue, 19 Mar 2019 13:32:05 +0000 (09:32 -0400)] 
Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Tue, 19 Mar 2019 05:43:33 +0000 (15:43 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
teor [Tue, 19 Mar 2019 05:43:05 +0000 (15:43 +1000)] 
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5

6 years agoMerge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge
teor [Mon, 18 Mar 2019 01:30:37 +0000 (11:30 +1000)] 
Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge

Comment merge.

6 years agoMerge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge
teor [Mon, 18 Mar 2019 01:29:20 +0000 (11:29 +1000)] 
Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge

6 years agotest/sr: update sr_state_free() to sr_state_free_all() in a comment
teor [Mon, 18 Mar 2019 01:28:34 +0000 (11:28 +1000)] 
test/sr: update sr_state_free() to sr_state_free_all() in a comment

6 years agoMerge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
teor [Mon, 18 Mar 2019 01:27:59 +0000 (11:27 +1000)] 
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge

6 years agotest/sr: Clear SRVs after init, and before setup
teor [Mon, 18 Mar 2019 01:12:25 +0000 (11:12 +1000)] 
test/sr: Clear SRVs after init, and before setup

Already merged to 0.4.0 and later in tor-github/pr/776.
Backported to 0.2.9 and later with minor comment changes.

Part of 29706.

6 years agoMerge branch 'bug28656_035_squashed' into maint-0.4.0
Nick Mathewson [Fri, 15 Mar 2019 12:59:19 +0000 (08:59 -0400)] 
Merge branch 'bug28656_035_squashed' into maint-0.4.0

6 years agoStop logging a BUG() warning when tor is waiting for exit descriptors
teor [Tue, 5 Mar 2019 02:53:14 +0000 (12:53 +1000)] 
Stop logging a BUG() warning when tor is waiting for exit descriptors

Fixes bug 28656; bugfix on 0.3.5.1-alpha.

6 years agoMerge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
Nick Mathewson [Fri, 15 Mar 2019 12:54:30 +0000 (08:54 -0400)] 
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0
Nick Mathewson [Fri, 15 Mar 2019 12:52:50 +0000 (08:52 -0400)] 
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0

6 years agorelays shouldn't close idle rend circuits
Roger Dingledine [Sat, 9 Mar 2019 08:18:25 +0000 (03:18 -0500)] 
relays shouldn't close idle rend circuits

Allow connections to single onion services to remain idle without being
disconnected.

Relays acting as rendezvous points for single onion services were
mistakenly closing idle established rendezvous circuits after 60 seconds,
thinking that they are unused directory-fetching circuits that had served
their purpose.

Fixes bug 29665; bugfix on 0.2.1.26.

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Wed, 13 Mar 2019 21:00:43 +0000 (07:00 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Wed, 13 Mar 2019 20:59:09 +0000 (06:59 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:56:38 +0000 (06:56 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:56:09 +0000 (06:56 +1000)] 
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:55:57 +0000 (06:55 +1000)] 
Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4

6 years agoMerge branch 'bug28096-029-squashed' into bug28096-034-squashed
teor [Wed, 13 Mar 2019 20:53:17 +0000 (06:53 +1000)] 
Merge branch 'bug28096-029-squashed' into bug28096-034-squashed

Merge the new code, and preserve the #else macro comment from 0.3.4.

6 years agoMerge remote-tracking branch 'nickm/bug27073_029' into bug27073_034
teor [Wed, 13 Mar 2019 20:47:32 +0000 (06:47 +1000)] 
Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034

Replace == with OP_EQ in test macros.

6 years agoMerge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
teor [Wed, 13 Mar 2019 20:41:14 +0000 (06:41 +1000)] 
Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4

6 years agoMerge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:37:50 +0000 (06:37 +1000)] 
Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:37:17 +0000 (06:37 +1000)] 
Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:36:47 +0000 (06:36 +1000)] 
Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:36:11 +0000 (06:36 +1000)] 
Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9
teor [Wed, 13 Mar 2019 20:35:05 +0000 (06:35 +1000)] 
Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9

6 years agotest/sr: Clear SRVs after init, and before setup
teor [Wed, 13 Mar 2019 05:27:48 +0000 (15:27 +1000)] 
test/sr: Clear SRVs after init, and before setup

Part of 29706.

6 years agoFix #28525 changes file that is breaking CI.
George Kadianakis [Tue, 12 Mar 2019 18:11:51 +0000 (20:11 +0200)] 
Fix #28525 changes file that is breaking CI.

6 years agoMerge branch 'tor-github/pr/763' into maint-0.4.0
George Kadianakis [Tue, 12 Mar 2019 16:11:35 +0000 (18:11 +0200)] 
Merge branch 'tor-github/pr/763' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
Nick Mathewson [Tue, 12 Mar 2019 15:03:37 +0000 (11:03 -0400)] 
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0

6 years agotest/sr: update sr_state_free() to sr_state_free_all()
teor [Tue, 12 Mar 2019 01:34:52 +0000 (11:34 +1000)] 
test/sr: update sr_state_free() to sr_state_free_all()

The function name changed between 0.2.9 and 0.3.4.

6 years agoMerge branch bug29706_029_refactor into bug29706_034_refactor
teor [Tue, 12 Mar 2019 01:31:52 +0000 (11:31 +1000)] 
Merge branch bug29706_029_refactor into bug29706_034_refactor

6 years agosr: BUG() on NULL sr_state before doing a state_query_*()
teor [Tue, 12 Mar 2019 01:09:48 +0000 (11:09 +1000)] 
sr: BUG() on NULL sr_state before doing a state_query_*()

Part of #29706.

6 years agosr: Check for replacing a SRV pointer with the same pointer
teor [Tue, 12 Mar 2019 00:24:34 +0000 (10:24 +1000)] 
sr: Check for replacing a SRV pointer with the same pointer

Check if the new pointer is the same as the old one: if it is, it's
probably a bug:
* the caller may have confused current and previous, or
* they may have forgotten to sr_srv_dup().

Putting NULL multiple times is allowed.

Part of 29706.

6 years agoMerge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
Nick Mathewson [Mon, 11 Mar 2019 13:45:31 +0000 (09:45 -0400)] 
Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0

6 years agosr: rename srv_dup() to sr_srv_dup()
teor [Sat, 9 Mar 2019 01:48:05 +0000 (11:48 +1000)] 
sr: rename srv_dup() to sr_srv_dup()

6 years agosr: Free SRVs before replacing them in state_query_put_()
teor [Sat, 9 Mar 2019 00:50:55 +0000 (10:50 +1000)] 
sr: Free SRVs before replacing them in state_query_put_()

Refactor the shared random state's memory management so that it actually
takes ownership of the shared random value pointers.

Fixes bug 29706; bugfix on 0.2.9.1-alpha.

6 years agotest/sr: Free SRVs before replacing them in test_sr_setup_srv()
teor [Sat, 9 Mar 2019 00:50:07 +0000 (10:50 +1000)] 
test/sr: Free SRVs before replacing them in test_sr_setup_srv()

Stop leaking parts of the shared random state in the shared-random unit
tests. The previous fix in 29599 was incomplete.

Fixes bug 29706; bugfix on 0.2.9.1-alpha.

6 years agoMerge branch 'pr_719_squashed_040' into maint-0.4.0
Nick Mathewson [Fri, 8 Mar 2019 15:25:43 +0000 (10:25 -0500)] 
Merge branch 'pr_719_squashed_040' into maint-0.4.0

6 years agoBug 29204: Inspect circuit queues before sending padding.
Mike Perry [Thu, 21 Feb 2019 01:34:55 +0000 (01:34 +0000)] 
Bug 29204: Inspect circuit queues before sending padding.

Mitigates OOM conditions at relays.

6 years agoMerge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
teor [Fri, 8 Mar 2019 09:37:18 +0000 (19:37 +1000)] 
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Fri, 8 Mar 2019 04:11:46 +0000 (14:11 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5
teor [Fri, 8 Mar 2019 04:11:14 +0000 (14:11 +1000)] 
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5

6 years agoMerge remote-tracking branch 'bug28525_029' into maint-0.3.5
teor [Fri, 8 Mar 2019 02:32:04 +0000 (12:32 +1000)] 
Merge remote-tracking branch 'bug28525_029' into maint-0.3.5

6 years agoMake tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware
Neel Chauhan [Sun, 3 Mar 2019 02:25:35 +0000 (21:25 -0500)] 
Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware

Fixes 28525.

6 years agoMerge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
Nick Mathewson [Thu, 7 Mar 2019 13:56:35 +0000 (08:56 -0500)] 
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0

6 years agoMerge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
Nick Mathewson [Thu, 7 Mar 2019 13:34:15 +0000 (08:34 -0500)] 
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
Nick Mathewson [Wed, 6 Mar 2019 19:29:43 +0000 (14:29 -0500)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
Nick Mathewson [Wed, 6 Mar 2019 19:29:38 +0000 (14:29 -0500)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
Nick Mathewson [Wed, 6 Mar 2019 19:29:33 +0000 (14:29 -0500)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.3 maint-0.3.3
Nick Mathewson [Wed, 6 Mar 2019 19:29:29 +0000 (14:29 -0500)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

6 years agoUpdate geoip and geoip6 to the March 4 2019 database.
Karsten Loesing [Wed, 6 Mar 2019 10:45:27 +0000 (11:45 +0100)] 
Update geoip and geoip6 to the March 4 2019 database.

6 years agoprotover: Add missing Padding to translate_to_rust
David Goulet [Fri, 1 Mar 2019 18:50:00 +0000 (13:50 -0500)] 
protover: Add missing Padding to translate_to_rust

This commit also explicitly set the value of the PRT enum so we can match/pin
the C enum values to the Rust one in protover/ffi.rs.

Fixes #29631

Signed-off-by: David Goulet <dgoulet@torproject.org>
6 years agodoc: Fix an incorrect comment about calling FreeLibrary() on Windows
teor [Mon, 4 Mar 2019 01:22:02 +0000 (11:22 +1000)] 
doc: Fix an incorrect comment about calling FreeLibrary() on Windows

There's an incorrect comment in compat_time.c that suggests we call
FreeLibrary() before we're done using the library's functions.
See 29642 for background.

Closes ticket 29643.

6 years agoMerge branch 'maint-0.3.5' into maint-0.4.0
teor [Fri, 1 Mar 2019 04:17:31 +0000 (14:17 +1000)] 
Merge branch 'maint-0.3.5' into maint-0.4.0

6 years agoMerge branch 'maint-0.3.4' into maint-0.3.5
teor [Fri, 1 Mar 2019 04:16:59 +0000 (14:16 +1000)] 
Merge branch 'maint-0.3.4' into maint-0.3.5

6 years agoMerge branch 'maint-0.3.3' into maint-0.3.4
teor [Fri, 1 Mar 2019 04:16:22 +0000 (14:16 +1000)] 
Merge branch 'maint-0.3.3' into maint-0.3.4

6 years agoMerge branch 'maint-0.2.9' into maint-0.3.3
teor [Fri, 1 Mar 2019 04:15:59 +0000 (14:15 +1000)] 
Merge branch 'maint-0.2.9' into maint-0.3.3

6 years agoMerge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:15:00 +0000 (14:15 +1000)] 
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:14:51 +0000 (14:14 +1000)] 
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9

6 years agoMerge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
teor [Fri, 1 Mar 2019 04:14:26 +0000 (14:14 +1000)] 
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9

6 years agoBug 25733: Avoid assert failure if all circuits time out.
Mike Perry [Mon, 16 Apr 2018 22:49:27 +0000 (22:49 +0000)] 
Bug 25733: Avoid assert failure if all circuits time out.

Prior to #23100, we were not counting HS circuit build times in our
calculation of the timeout. This could lead to a condition where our timeout
was set too low, based on non HS circuit build times, and then we would
abandon all HS circuits, storing no valid timeouts in the histogram.

This commit avoids the assert.