George Kadianakis
d885ed867f
Merge branch 'tor-github/pr/937'
2019-04-30 19:21:46 +03:00
George Kadianakis
9084a90b00
Merge branch 'tor-github/pr/936'
2019-04-30 19:21:15 +03:00
George Kadianakis
a44aca5453
Merge branch 'tor-github/pr/993'
2019-04-30 19:13:57 +03:00
George Kadianakis
86f8dfe419
Merge branch 'tor-github/pr/983'
2019-04-30 19:13:30 +03:00
David Goulet
43c119fedb
Merge branch 'tor-github/pr/980'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-04-30 11:50:36 -04:00
David Goulet
e543c4e20c
Merge branch 'tor-github/pr/909'
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-04-30 11:17:45 -04:00
Nick Mathewson
7e03500eef
Changes file for periodic event movement
2019-04-30 11:14:59 -04:00
Nick Mathewson
48e1ab1720
Changes file for 29732.
2019-04-30 11:11:39 -04:00
Nick Mathewson
44e6663b8a
Merge remote-tracking branch 'tor-github/pr/972'
2019-04-29 13:36:35 -04:00
Nick Mathewson
206d28ff15
Merge branch 'maint-0.4.0'
2019-04-29 10:15:11 -04:00
Nick Mathewson
593d29920e
Merge remote-tracking branch 'tor-github/pr/974' into maint-0.4.0
2019-04-29 10:15:03 -04:00
Nick Mathewson
806539b40a
Use fast check for missing id in node_is_a_configured_bridge()
...
Fixes bug 30308; bugfix on 0.3.5.1-alpha.
2019-04-26 11:19:46 -04:00
Nick Mathewson
650b94ebc1
Use a linear algorithm to subtract two nodelists.
...
The nodelist_idx for each node_t serves as a unique identifier for
the node, so we can use a bitarray to hold all the excluded
nodes, and then remove them from the smartlist.
Previously use used smartlist_subtract(sl, excluded), which is
O(len(sl)*len(excluded)).
We can use this function in other places too, but this is the one
that showed up on the profiles of 30291.
Closes ticket 30307.
2019-04-26 11:04:44 -04:00
Nick Mathewson
efeb101b96
Merge remote-tracking branch 'tor-github/pr/889'
2019-04-25 20:25:34 -04:00
Nick Mathewson
3ed7ceeb85
changes file for ticket 30091 (controller parsing refactor)
2019-04-25 14:13:03 -04:00
Nick Mathewson
dbfe1a14e4
When parsing a multiline controller command, be careful with linebreaks
...
The first line break in particular was mishandled: it was discarded
if no arguments came before it, which made it impossible to
distinguish arguments from the first line of the body.
To solve this, we need to allocate a copy of the command rather than
using NUL to separate it, since we might have "COMMAND\n" as our input.
Fixes ticket 29984.
2019-04-25 14:13:03 -04:00
George Kadianakis
974c2674eb
Merge branch 'maint-0.4.0'
2019-04-25 15:47:07 +03:00
George Kadianakis
a39789a02c
Merge branch 'tor-github/pr/960' into maint-0.4.0
2019-04-25 15:46:45 +03:00
George Kadianakis
811a93f803
Merge branch 'tor-github/pr/953'
2019-04-25 15:43:47 +03:00
Nick Mathewson
6320b2988c
Merge remote-tracking branch 'tor-github/pr/942'
2019-04-24 17:06:56 -04:00
Nick Mathewson
0cbe0f9cab
Merge remote-tracking branch 'tor-github/pr/964'
2019-04-24 17:05:20 -04:00
David Goulet
f39dd0a700
Merge branch 'tor-github/pr/951'
2019-04-24 09:53:15 -04:00
David Goulet
5bcf87c224
Merge branch 'tor-github/pr/955'
2019-04-24 09:45:32 -04:00
David Goulet
4b599aaae4
Merge branch 'tor-github/pr/939'
2019-04-24 09:43:28 -04:00
Nick Mathewson
15d4238383
Merge remote-tracking branch 'tor-github/pr/944'
2019-04-23 15:39:23 -04:00
Nick Mathewson
475ac11bc1
Merge remote-tracking branch 'tor-github/pr/935'
2019-04-23 14:11:04 -04:00
Nick Mathewson
6559aefc7b
Merge remote-tracking branch 'tor-github/pr/971'
2019-04-23 12:52:54 -04:00
Nick Mathewson
b0459de217
Merge branch 'ticket30051_take2_squashed'
2019-04-23 12:51:44 -04:00
rl1987
0c78811cea
Add changes file
2019-04-23 12:51:29 -04:00
Nick Mathewson
a7599c5be2
Merge remote-tracking branch 'tor-github/pr/962'
2019-04-23 12:48:37 -04:00
teor
1788343aff
Stop looking for scripts in the build directory during "make shellcheck"
...
Fixes bug 30263; bugfix on 0.4.0.1-alpha.
2019-04-23 12:31:14 +10:00
teor
ac5753d3ca
Coding Standards: Document how to find git commits
...
Document how to find git commits and tags for bug fixes in
CodingStandards.md.
And update some changes file documentation.
Closes ticket 30261.
2019-04-23 10:03:18 +10:00
teor
9a97b5ff56
Travis: Show stem's tor log after failure
...
Closes ticket 30234.
2019-04-22 11:48:07 +10:00
teor
231036a110
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-19 12:00:41 +10:00
teor
742b5b32d5
Merge remote-tracking branch 'tor-github/pr/710' into maint-0.3.5
2019-04-19 11:52:48 +10:00
teor
cb084de5e5
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.3.5
2019-04-19 11:51:05 +10:00
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
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
rl1987
0d88b808e9
Remove contrib/dist/tor.sh.in
2019-04-17 13:15:02 +03: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
c72f0cd5c7
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-17 16:46:40 +10: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
