Nick Mathewson
44edfa7adc
Update to 0.3.5.7-dev
2019-01-07 21:18:25 -05:00
Nick Mathewson
971f4bf139
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump
2019-01-07 21:17:46 -05:00
Nick Mathewson
41bb778227
Update to 0.3.4.10-dev
2019-01-07 21:17:34 -05:00
Nick Mathewson
50a686e586
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"Ours" to avoid version bump.
2019-01-07 21:16:56 -05:00
Nick Mathewson
b5fdb91ada
Update to 0.3.3.3.11-dev
2019-01-07 21:16:40 -05:00
Nick Mathewson
52b508735f
Bump version to 0.3.5.7
2019-01-07 10:23:21 -05:00
Nick Mathewson
d51595ec57
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2019-01-07 10:22:47 -05:00
Nick Mathewson
ea47563dd7
Bump to 0.3.4.10
2019-01-07 10:22:42 -05:00
Nick Mathewson
d8196dc200
Merge branch 'maint-0.3.3' into maint-0.3.4
...
"ours" merge to avoid version bump.
2019-01-07 10:22:13 -05:00
Nick Mathewson
63eed6edff
Bump to 0.3.3.11
2019-01-07 10:21:59 -05:00
Nick Mathewson
85c5f58509
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-07 08:43:46 -05:00
Nick Mathewson
3d18903f53
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-07 08:43:45 -05:00
Nick Mathewson
ba71b17865
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-07 08:43:45 -05:00
Karsten Loesing
445d6750f7
Update geoip and geoip6 to the January 3 2019 database.
2019-01-07 09:00:29 +01:00
Nick Mathewson
74bda3079c
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 15:04:58 -05:00
Nick Mathewson
d7259b64d4
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 15:04:58 -05:00
Nick Mathewson
fee2eaf2d4
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-04 15:04:58 -05:00
Nick Mathewson
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
Nick Mathewson
16deb1f5f2
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 14:57:06 -05:00
Nick Mathewson
fe3331b845
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 14:57:06 -05:00
Nick Mathewson
bf8bb9c526
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
2019-01-04 14:49:16 -05:00
Nick Mathewson
fa05efdf8b
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-04 14:36:02 -05:00
Nick Mathewson
d47c9276de
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4
2019-01-04 14:34:38 -05:00
Nick Mathewson
c75cf802d3
Merge branch 'ticket28879' into maint-0.3.5
2019-01-03 21:34:35 -05:00
Nick Mathewson
abdc6aede2
Merge branch 'ticket28851_035_squashed' into maint-0.3.5
2019-01-03 09:45:53 -05:00
Nick Mathewson
b82717b273
Stop re-checking our hardcoded dh parameters on every startup
...
Closes ticket 28851.
2019-01-03 09:45:43 -05:00
Nick Mathewson
98736cf36a
Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5
2019-01-03 09:44:10 -05:00
Nick Mathewson
3e64553f76
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-03 09:02:39 -05:00
Nick Mathewson
ed62f0fa15
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-03 09:02:39 -05:00
Nick Mathewson
1ea3127188
Merge branch 'ticket28973_033_squashed' into maint-0.3.3
2019-01-03 09:01:40 -05:00
Nick Mathewson
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
Nick Mathewson
98755cbddf
Merge branch 'bug28974_035' into maint-0.3.5
2019-01-02 16:15:34 -05:00
Nick Mathewson
a4b86421d2
ticket 28924 deserves a changes file. I made one, but I guess I forgot to git add
2019-01-02 16:09:10 -05:00
Nick Mathewson
b33bcb1e63
Add an errno.h include to freespace.c to fix bug 28974.
2019-01-02 15:19:52 -05:00
Nick Mathewson
a9eec33649
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-21 15:42:57 -05:00
David Goulet
2420e84ba4
mainloop: Reactivate the linked connection event with a non empty list
...
Linked connections aren't woken up by libevent due to I/O but rather
artificially so we can, by chunks, empty the spooled object(s).
Commit 5719dfb48f
(in 0.3.4.1-alpha) made it
that the schedule_active_linked_connections_event would be only called once at
startup but this is wrong because then we would never go through again the
active linked connections.
Fortunately, everytime a new linked connection is created, the event is
activated and thus we would go through the active list again. On a busy relay,
this issue is mitigated by that but on a slower relays or bridge, a connection
could get stuck for a while until a new directory information request would
show up.
Fixes #28717 , #28912
2018-12-21 11:25:23 -05:00
Nick Mathewson
97c9ced70a
Try @warning_flags to avoid bloating verbose make logs
...
We now accumulate warning flags in a separate variable,
"TOR_WARNING_FLAGS", and write it to a "warning_flags" file. Then
we test whether the compiler will accept "@warning_flags": if so, we
put "@warning_flags" in the CFLAGS; if not, we copy the contents of
"$TOR_WARNING_FLAGS" into the CFLAGS.
Closes ticket 28924.
2018-12-21 10:00:23 -05:00
Nick Mathewson
ef97543270
Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5
2018-12-20 07:49:59 -05:00
teor
02009c66c0
Stop running stem's unit tests as part of "make test-stem"
...
But continue to run stem's unit and online tests during
"make test-stem-full".
Fixes bug 28568; bugfix on 0.2.6.3-alpha.
2018-12-20 13:01:18 +10:00
Nick Mathewson
b7018b1a24
Merge branch 'ticket28883_035' into maint-0.3.5
2018-12-19 15:36:03 -05:00
Nick Mathewson
26bbeb298d
Merge branch 'bug28612_squashed' into maint-0.3.5
2018-12-18 13:55:57 -05:00
Nick Mathewson
1c2abea30a
Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
...
Fixes bug 28612; bugfix on 0.3.5.3-alpha.
2018-12-18 13:55:08 -05:00
Nick Mathewson
702fd6f0f2
Merge branch 'ticket28881_035' into maint-0.3.5
2018-12-18 13:52:36 -05:00
Nick Mathewson
4894d44ab8
Always initialize addr in parse_port_config()
...
It was always analyzed before use, but scan-build wasn't able to
persuade itself of that.
Closes ticket 28881.
2018-12-18 13:52:25 -05:00
Nick Mathewson
bf71dce01a
Bump version to 0.3.5.6-rc-dev
2018-12-18 13:33:49 -05:00
Nick Mathewson
c61cd5775c
Revert "Log bootstrap tag names"
...
This reverts commit 1b855af5e3
.
2018-12-18 08:09:43 -05:00
Nick Mathewson
d8f41c2870
Bump to 0.3.5.6-rc
2018-12-18 08:04:04 -05:00
Nick Mathewson
1a9a9fc0ff
Changes file for 28562
2018-12-17 10:57:47 -05:00
Taylor R Campbell
ed71e1e89c
Create a temporary directory for tor's DataDirectory in test_rebind.
...
Fixes #28562 .
While here, put the argument count test and usage message _before_ we
attempt to read from sys.argv.
2018-12-17 10:32:28 -05:00
Nick Mathewson
315c21d2e2
test_rebind: wait for tor to timeout, even if it is logging a lot
...
Fixes bug 28883; bugfix on 0.3.5.4-alpha.
2018-12-17 09:53:17 -05:00