65343a966e
Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035
2019-08-09 09:49:35 +10:00
4665ac9ec7
Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035
2019-08-09 09:49:27 +10:00
2bc8989d83
Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
2019-08-09 09:48:41 +10:00
7667c1cbaf
Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029
2019-08-09 09:48:28 +10:00
a9dab83106
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-08 15:25:00 -04:00
53d5b67f07
Merge branch 'ticket31374_035' into maint-0.4.1
2019-08-08 15:24:52 -04:00
b560d94ac0
Merge branch 'ticket31374_029' into ticket31374_035
2019-08-08 11:46:24 -04:00
3a280b35ee
Fix a warning about casting the results of GetProcAddress.
...
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
2019-08-08 11:44:19 -04:00
6c83fe996b
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-08 11:24:08 -04:00
0bc5b7ae95
Merge branch 'ticket31343_040' into maint-0.4.1
2019-08-08 11:23:59 -04:00
1087c48d6e
Hardcode the image into tor-exit-notice.html
2019-08-08 22:46:51 +10:00
5c4ec3f335
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-08 11:20:03 +10:00
40d7f1e3a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-08-08 11:19:58 +10:00
0a661cde1d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-08-08 11:19:38 +10:00
e83eabc9bf
Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
...
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
2019-08-08 11:17:46 +10:00
97e7be2717
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
2019-08-08 11:07:34 +10:00
e15b9b1790
Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5
2019-08-08 11:07:11 +10:00
8d22c09abf
Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
2019-08-08 10:55:24 +10:00
518b69b57c
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
2019-08-08 10:54:12 +10:00
941edca160
start on changelog and releasenotes for 0.4.1.5
2019-08-07 13:45:43 -04:00
79569d86b3
Merge branch 'ticket31343_035' into ticket31343_040
2019-08-06 11:18:40 -04:00
bc9492a938
Merge branch 'ticket31343_029' into ticket31343_035
2019-08-06 11:15:20 -04:00
0849d2a2fd
Avoid using labs() on time_t in channeltls.c
...
On some windows builds, time_t is 64 bits but long is not. This is
causing appveyor builds to fail.
Also, one of our uses of labs() on time_t was logically incorrect:
it was telling us to accept NETINFO cells up to three minutes
_before_ the message they were responding to, which doesn't make
sense.
This patch adds a time_abs() function that we should eventually move
to intmath.h or something. For now, though, it will make merges
easier to have it file-local in channeltls.c.
Fixes bug 31343; bugfix on 0.2.4.4-alpha.
2019-08-06 11:11:06 -04:00
5a918ced20
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-06 09:19:11 -04:00
21531f35f3
Merge branch 'ticket31311_041' into maint-0.4.1
2019-08-06 09:19:05 -04:00
53abbc784e
Merge branch 'maint-0.4.1' into release-0.4.1
2019-08-05 09:59:40 -04:00
74c0595965
Ignore regular cells in padding circuits.
...
Padding circuits were regular cells that got closed before their padding
machine could finish. This means that they can still receive regular cells from
their past life, but they have no way or reason to answer them anymore. Hence
let's ignore them before they even get to the proper subsystems.
2019-08-05 13:48:58 +03:00
3945282419
make dist: only include files from practracker dir intentionally.
...
Previously, we included temporary files and whatnot, which is not
good.
Fixes bug 31311; bugfix on 0.4.1.1-alpha.
2019-08-01 13:47:05 -04:00
3c8a7cb54c
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-29 12:02:54 -04:00
1d6054f750
Merge branch 'tor-github/pr/1179' into maint-0.4.1
2019-07-29 12:02:47 -04:00
f05624030a
more entries for 0.4.1.4-rc changelog
2019-07-25 11:02:29 -04:00
53ece8bd23
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 10:27:41 -04:00
af26cd6101
Always check the retval of circpad_machine_current_state().
2019-07-25 10:24:23 -04:00
bd1ac408d8
Remove dead code from circpad_machine_remove_token().
2019-07-25 10:24:19 -04:00
530347972d
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-25 09:03:01 -04:00
2a4b156978
Merge branch 'tor-github/pr/1171' into maint-0.4.1
2019-07-25 09:02:53 -04:00
08b3436ae8
Start on 0.4.1.4-rc changelog
2019-07-25 09:00:08 -04:00
b0a06e7b18
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-24 12:32:06 +03:00
bb33a2f290
Merge branch 'tor-github/pr/1181' into maint-0.4.1
2019-07-24 12:31:56 +03:00
6340873047
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-23 09:39:51 -04:00
c541258fac
Merge branch 'tor-github/pr/1158' into maint-0.4.1
2019-07-23 09:39:43 -04:00
ec38b662f2
Bug 30649: Changes file.
2019-07-23 12:22:23 +03:00
a9379d6750
Set 'routerlist' global to NULL before freeing it.
...
There is other code that uses this value, and some of it is
apparently reachable from inside router_dir_info_changed(), which
routerlist_free() apparently calls. (ouch!) This is a minimal fix
to try to resolve the issue without causing other problems.
Fixes bug 31003. I'm calling this a bugfix on 0.1.2.2-alpha, where
the call to router_dir_info_changed() was added to routerlist_free().
2019-07-19 09:49:52 -04:00
8bbec36b3b
Changes file for bug 31001
2019-07-19 09:21:45 -04:00
97d73db7c3
Changes file for bug 31001
2019-07-19 09:21:08 -04:00
09c692e72b
Use a 64-bit mask for log domains, and fix a conflict
...
When we added LD_MESG, we created a conflict with the LD_NO_MOCK
flag. We now need 64 bits for log domains in order to fix this
issue.
Fixes bug 31080; bugfix on 0.4.1.1-alpha.
2019-07-08 13:32:45 -04:00
2a42d6be27
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-07-01 14:25:12 -04:00
1dd9527897
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-07-01 14:25:12 -04:00
f6c58d9f00
Merge branch 'maint-0.4.1' into release-0.4.1
2019-07-01 14:25:12 -04:00
5e16601000
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-07-01 14:25:12 -04:00
teor
Nick Mathewson
rl1987
George Kadianakis
David Goulet
Mike Perry