teor
2ae67fee42
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.3.5
2019-04-19 11:48:41 +10:00
teor
4a66c2d636
Merge remote-tracking branch 'tor-github/pr/947' into maint-0.3.5
2019-04-19 11:47:50 +10:00
teor
116970dda7
Merge remote-tracking branch 'tor-github/pr/946' into maint-0.3.4
2019-04-19 11:47:10 +10:00
teor
b1762f8d12
Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4
2019-04-19 11:44:38 +10:00
teor
8154b33f9c
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4
2019-04-19 11:43:46 +10:00
teor
2460b4461f
Merge remote-tracking branch 'tor-github/pr/792' into maint-0.2.9
2019-04-19 11:42:09 +10:00
teor
4d504bf098
Merge branch 'maint-0.2.9' into maint-0.3.4
...
"ours" merge, to avoid taking any changes from PR 772 in 0.3.4.
(We already merged a different fix for 23790 into 0.3.2 and later.)
2019-04-19 11:39:17 +10:00
teor
ec213ae8a0
Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9
2019-04-19 11:38:52 +10:00
teor
bffba9d26f
practracker: accept more lines in microdescs_parse_from_string()
...
Part of 28223.
2019-04-19 10:34:16 +10:00
George Kadianakis
78223ab0fc
Merge branch 'tor-github/pr/938'
2019-04-18 13:23:32 +03:00
George Kadianakis
2db9bb02c7
Merge branch 'tor-github/pr/925'
2019-04-18 13:22:54 +03:00
George Kadianakis
d867b7ae1d
Merge branch 'maint-0.4.0'
2019-04-18 13:22:23 +03:00
George Kadianakis
6a179b1072
Merge branch 'tor-github/pr/891' into maint-0.4.0
2019-04-18 13:21:59 +03:00
Neel Chauhan
caa55a6d37
Grammar fixes for IPv6Exit in tor.1.txt
2019-04-17 21:41:31 -04:00
Neel Chauhan
cfada969a9
Update tor.1 man page for IPv6Exit
2019-04-17 07:26:55 -04:00
rl1987
0d88b808e9
Remove contrib/dist/tor.sh.in
2019-04-17 13:15:02 +03:00
teor
f12b990bbf
practracker: accept the extra 25 line string from 27821
2019-04-17 18:44:26 +10:00
teor
c483ccf1c9
connection_edge: remove an extra ;
2019-04-17 18:43:20 +10:00
teor
728d20ed08
connection_edge: Return a web page when HTTPTunnelPort is misconfigured
...
Return an informative web page when the HTTPTunnelPort is used as an
HTTP proxy.
Closes ticket 27821, patch by "eighthave".
2019-04-17 17:58:40 +10:00
teor
ef97e6c553
Merge branch 'maint-0.4.0'
2019-04-17 16:46:47 +10:00
teor
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-17 16:46:40 +10:00
Mike Perry
17a164a827
Bug 30173: Rate limit padding rate limit log message.
...
Gotta limit to the limit when the limit is reached.
2019-04-17 02:51:48 +00:00
Mike Perry
21a4438c58
Bug 30173: Add consensus param to disable padding.
...
Disable padding via limit check and machine condition. Limits cause us to stop
sending padding. Machine conditions cause the machines to be shut down, and
not restarted.
2019-04-17 02:44:42 +00:00
teor
37d7daa3cd
changes: update the changes file for 30001
2019-04-17 12:34:33 +10:00
Bernhard M. Wiedemann
8c4e68438d
Do not warn about compatible OpenSSL upgrades
...
When releasing OpenSSL patch-level maintenance updates,
we do not want to rebuild binaries using it.
And since they guarantee ABI stability, we do not have to.
Without this patch, warning messages were produced
that confused users:
https://bugzilla.opensuse.org/show_bug.cgi?id=1129411
Fixes bug 30190; bugfix on 0.2.4.2-alpha commit 7607ad2bec
2019-04-17 01:55:04 +02:00
Neel Chauhan
f643020e64
Update practracker exceptions.txt for policies.c
2019-04-16 09:16:52 -04:00
Neel Chauhan
ada6732914
Clarify comment about IPv6Exit in policies_parse_exit_policy_from_options()
2019-04-16 08:22:17 -04:00
Neel Chauhan
06c76e79aa
Clarify torrc comment for IPv6Exit
2019-04-16 08:20:48 -04:00
Neel Chauhan
e7c22e6e48
Add policy_using_default_exit_options() to determine if we're using the default exit options
2019-04-16 08:19:44 -04:00
Nick Mathewson
82b690d7da
Merge remote-tracking branch 'tor-github/pr/910'
2019-04-16 08:09:20 -04:00
Nick Mathewson
7b2357a37a
Merge remote-tracking branch 'tor-github/pr/884'
2019-04-16 08:08:06 -04:00
Nick Mathewson
950d890f77
In warn_if_nul_found, log surrounding context.
...
We need to encode here instead of doing escaped(), since fwict
escaped() does not currently handle NUL bytes.
Also, use warn_if_nul_found in more cases to avoid duplication.
2019-04-15 15:33:09 -04:00
Nick Mathewson
0c42ddf28c
fixup! Even more diagnostic messages for bug 28223.
...
Use TOR_PRIuSZ in place of %zu.
2019-04-15 15:21:18 -04:00
Nick Mathewson
82a3161c41
Document check for 30176, since it's a bit subtle.
2019-04-15 14:52:08 -04:00
Tobias Stoeckmann
670d0f9f5b
Clear memory in smartlist_remove_keeporder.
...
The smartlist functions take great care to reset unused pointers inside
the smartlist memory to NULL.
The function smartlist_remove_keeporder does not clear memory in such
way when elements have been removed. Therefore call memset after the
for-loop that removes elements. If no element is removed, it is
effectively a no-op.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
2019-04-15 14:51:36 -04:00
Tobias Stoeckmann
5a0c857996
Add test to verify that unused pointers are NULL.
...
The smartlist code takes great care to set all unused pointers inside
the smartlist memory to NULL. Check if this is also the case after
modifying the smartlist multiple times.
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
2019-04-15 14:46:26 -04:00
Nick Mathewson
3105081c2f
Fix assertf() issues when ALL_BUGS_ARE_FATAL is defined.
...
Fix from Gisle Vanem; fixes bug 30179. Bug not in any released
version of Tor.
2019-04-15 14:37:46 -04:00
Nick Mathewson
358df18064
Merge branch 'bug30189_035' into bug30189_041
2019-04-15 14:27:32 -04:00
Nick Mathewson
802ac8ad61
Use a tor_abort_() wrapper in our util_bug.h macros
...
Previously, our use of abort() would break anywhere that we didn't
include stdlib.h. This was especially troublesome in case where
tor_assert_nonfatal() was used with ALL_BUGS_ARE_FATAL, since that
one seldom gets tested.
As an alternative, we could have just made this header include
stdlib.h. But that seems bloaty.
Fixes bug 30189; bugfix on 0.3.4.1-alpha.
2019-04-15 14:16:23 -04:00
George Kadianakis
9ae267538c
Merge branch 'tor-github/pr/941'
2019-04-15 13:57:40 +03:00
George Kadianakis
3f9efc5e88
Merge branch 'maint-0.4.0'
2019-04-15 13:56:48 +03:00
George Kadianakis
15591e1bbd
Merge branch 'tor-github/pr/948' into maint-0.4.0
2019-04-15 13:56:37 +03:00
rl1987
55b4f02ba6
Fix shellcheck warnings in fixup_filenames.sh
2019-04-15 12:13:35 +03:00
teor
1177818c32
Merge branch 'rust-panic1-035' into rust-panic1-040
2019-04-15 10:18:59 +10:00
teor
a6d0420f7c
Merge branch 'rust-panic1-034' into rust-panic1-035
...
Trivial merge: a blank line was removed between 0.3.4 and 0.3.5.
2019-04-15 10:18:01 +10:00
teor
5ab5c8ec15
Merge branch 'rust-panic1' into rust-panic1-034
2019-04-15 10:15:02 +10:00
Neel Chauhan
cc87acf29b
Remove unused get_options()
2019-04-14 14:51:42 -04:00
Neel Chauhan
d4f980d29a
Update exceptions.txt for Bug #29613
2019-04-14 14:27:29 -04:00
Neel Chauhan
e728811110
Add changes file for Bug #29613
2019-04-14 12:48:07 -04:00
Neel Chauhan
03464a9165
Update torrc.sample.in to IPv6Exit 1 being an exit by default
2019-04-14 12:48:07 -04:00
