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
efeb101b96
Merge remote-tracking branch 'tor-github/pr/889'
2019-04-25 20:25:34 -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
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
Nick Mathewson
82b690d7da
Merge remote-tracking branch 'tor-github/pr/910'
2019-04-16 08:09:20 -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
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
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
e728811110
Add changes file for Bug #29613
2019-04-14 12:48:07 -04:00
rl1987
db52180abe
Add changes file
2019-04-12 22:43:49 +03:00
teor
8ff6ab0a39
changes: file for 30117
2019-04-12 08:38:30 -04:00
George Kadianakis
7b386f2356
Merge branch 'tor-github/pr/908'
2019-04-12 13:47:08 +03:00
