torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,775 Commits 53 Branches 631 Tags
830b659fedf52ad81554328a0601a5502a8ea72f
Commit Graph

7507 Commits

Author SHA1 Message Date
Nick Mathewson 830b659fed Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-09 09:38:27 -05:00
Nick Mathewson 694e3c57fd Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5 2019-01-09 09:38:22 -05:00
Nick Mathewson 7db07d6741 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-09 09:35:40 -05:00
rl1987 380ae2b74b Stop logging 'Your Guard' in circpathbias.c 2019-01-09 09:35:36 -05:00
Nick Mathewson 7ce8548c28 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-09 08:52:10 -05:00
Kris Katterjohn 09472791d0 Add changes file for bug 28938 
The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0.

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
 2019-01-09 08:52:05 -05:00
Kris Katterjohn c59b572e93 Fix tor_ersatz_socketpair on IPv6-only systems 
In get_local_listener used by tor_ersatz_socketpair, the address
family used when binding the IPv6 socket was AF_INET instead of
AF_INET6.

Fixes bug 28995; bugfix on 0.3.5.1-alpha.

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
 2019-01-07 17:28:21 -06:00
Nick Mathewson f0faee0677 Add geoip entry to 0.3.5.7 changelog 2019-01-07 09:09:50 -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 cd9a85a522 Merge branch 'maint-0.3.5' into release-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 73de7b4bcb Merge branch 'bug21394_029_redux' into maint-0.2.9 2019-01-04 15:04:54 -05:00
Nick Mathewson 54049cb6f4 Start an 0.3.5.7 changelog 2019-01-04 15:03:01 -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 d47c9276de Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4 2019-01-04 14:34:38 -05:00
Nick Mathewson 0644368009 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 21:34:43 -05:00
Nick Mathewson c75cf802d3 Merge branch 'ticket28879' into maint-0.3.5 2019-01-03 21:34:35 -05:00
Nick Mathewson 3ef8d4fb19 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 09:45:56 -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 aeb3f46097 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 09:44:15 -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 55474b9d99 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-03 09:02:40 -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 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 0d51da0a14 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-02 16:15:39 -05:00
Nick Mathewson 98755cbddf Merge branch 'bug28974_035' into maint-0.3.5 2019-01-02 16:15:34 -05:00
Nick Mathewson 9eb2da6b52 Merge branch 'maint-0.3.5' into release-0.3.5 2019-01-02 16:09:14 -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 f4874765ea Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-21 15:42:58 -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 57931fae0a Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-20 07:50:04 -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 bc6f149133 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-19 15:36:08 -05:00
Nick Mathewson b7018b1a24 Merge branch 'ticket28883_035' into maint-0.3.5 2018-12-19 15:36:03 -05:00
Nick Mathewson 6d375e1cb7 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-18 13:56:22 -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 a8fba6e1d0 Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-18 13:52:39 -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 a06093faaa Begin a changelog for 0.3.5.6-rc 2018-12-18 08:14:09 -05:00
Nick Mathewson e64157a54f Merge branch 'maint-0.3.5' into release-0.3.5 2018-12-18 08:10:11 -05:00