31583 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	de76862fd6	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-04-03 09:27:44 -04:00
Nick Mathewson	4aa02d3c7a	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-04-03 09:27:43 -04:00
Nick Mathewson	3cfcfbac46	Merge branch 'maint-0.2.9' into maint-0.3.4	2019-04-03 09:27:42 -04:00
Karsten Loesing	54e249e269	Update geoip and geoip6 to the April 2 2019 database.	2019-04-03 09:26:28 +02:00
teor	9242f32883	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-04-02 11:45:31 +10:00
teor	0418d4081a	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-04-02 11:45:22 +10:00
teor	74775b2dfd	Merge branch 'maint-0.2.9' into maint-0.3.4	2019-04-02 11:45:13 +10:00
teor	6d188fb4cc	Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0	2019-03-27 12:31:07 +10:00
teor	ca29cb397b	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-03-27 10:02:47 +10:00
teor	3280e9a116	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-03-27 10:02:40 +10:00
teor	6d057c56f1	Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4	2019-03-27 10:01:45 +10:00
teor	9ae8d663ea	Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0	2019-03-27 09:36:26 +10:00
George Kadianakis	06951cb3fc	Merge branch 'tor-github/pr/847' into maint-0.4.0	2019-03-26 15:16:21 +02:00
teor	4258728d56	Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0	2019-03-26 19:15:46 +10:00
juga0	6ecf9590ea	changes: add file for #21377	2019-03-26 17:41:21 +10:00
juga0	da7a8d7624	dircache: fix identation and remove unneded goto	2019-03-26 17:41:17 +10:00
juga0	892b918b66	bwauth: remove declaring args, they are now in use	2019-03-26 17:41:13 +10:00
juga0	a4bf3be8bc	test: check that .../bandwidth.z is compressed	2019-03-26 17:41:09 +10:00
juga0	fb4a40c32c	test: Check bw file cache lifetime	2019-03-26 17:41:06 +10:00
juga0	7627134743	bwauth: increment bw file cache lifetime ... Increment bw file cache lifetime when serving it by HTTP. And add a constant to define that lifetime.	2019-03-26 17:41:02 +10:00
juga0	4d3502e45b	bwauth: check and use compression serving bw file	2019-03-26 17:40:58 +10:00
juga0	b75e2539f9	bwauth: check if a bw file could be read ... Before serving it by HTTP.	2019-03-26 17:40:54 +10:00
juga0	ee09e5d7ea	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.	2019-03-26 17:40:50 +10:00
juga0	3eacae42b2	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.	2019-03-26 17:40:45 +10:00
teor	828033001b	Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0	2019-03-26 16:56:45 +10:00
rl1987	669ec64325	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.	2019-03-26 12:24:45 +10:00
teor	3af9a51118	test/dir: add a 4th argument to dirserv_read_measured_bandwidths() ... Part of 29806.	2019-03-26 11:49:33 +10:00
teor	b76ae3898d	Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged	2019-03-26 11:48:52 +10:00
Taylor Yu	5d2f5e482e	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.	2019-03-25 14:13:45 +10:00
Alexander Færøy	4be522b2e6	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 bfb94dd2ca. See: https://bugs.torproject.org/29874	2019-03-25 03:10:37 +01:00
Nick Mathewson	8bc3ac6a84	Bump to 0.4.0.3-alpha-dev	2019-03-23 08:44:36 -04:00
Nick Mathewson	4b79b43e3e	Merge branch 'bug29693_040_radical_squashed' into maint-0.4.0	2019-03-22 11:17:01 -04:00
George Kadianakis	a5df9402b6	prob-distr: Decrease false positive rate of stochastic tests.	2019-03-22 11:16:30 -04:00
teor	f7688cb179	test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9 ... We need a recent test-network.sh to use new chutney features in CI. Fixes bug 29703; bugfix on 0.2.9.1-alpha.	2019-03-22 13:20:23 +10:00
Nick Mathewson	ebc7556dd0	Bump version to 0.4.0.3-alpha	2019-03-21 09:36:19 -04:00
teor	091f8688b8	test/dir: add an extra argument to dirserv_read_measured_bandwidths() ... Part of 29806.	2019-03-21 12:56:28 +10:00
teor	3adb689fbc	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.	2019-03-21 12:04:30 +10:00
juga0	4ab2e9a599	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.	2019-03-21 12:00:45 +10:00
teor	3871fb732d	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-03-20 09:48:12 +10:00
teor	41cd05562f	Merge branch 'maint-0.3.4' into maint-0.3.5	2019-03-20 09:48:03 +10:00
teor	d7a5fdcb74	Merge branch 'maint-0.2.9' into maint-0.3.4	2019-03-20 09:47:55 +10:00
teor	6bf9078ceb	Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5	2019-03-20 09:47:31 +10:00
teor	db2ac3b9fe	Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9	2019-03-20 09:46:10 +10:00
Nick Mathewson	de5ab1ef49	Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0	2019-03-19 09:32:05 -04:00
teor	b4483edce0	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-03-19 15:43:33 +10:00
teor	17e3eea685	Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5	2019-03-19 15:43:05 +10:00
teor	af21d126e6	Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge ... Comment merge.	2019-03-18 11:30:37 +10:00
teor	55865a2c9c	Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge	2019-03-18 11:29:20 +10:00
teor	aec6ee201b	test/sr: update sr_state_free() to sr_state_free_all() in a comment	2019-03-18 11:28:34 +10:00
teor	1d0146e2a2	Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge	2019-03-18 11:27:59 +10:00