Nick Mathewson
761f1bf71e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-18 12:25:08 -05:00
Nick Mathewson
4cca7fb99b
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-18 12:25:08 -05:00
Nick Mathewson
d1af4d65df
Merge branch 'maint-0.3.5'
2019-01-18 12:25:08 -05:00
Nick Mathewson
a8580a6836
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-18 12:25:08 -05:00
Nick Mathewson
7c6a8c674b
Fix documentation for ClientAuth on HSv3.
...
The manpage erroneously said "privkey" when "public-key" would have
been correct. Reported by "Felixix" as ticket 28979. Bugfix on
0.3.5.1-alpha.
2019-01-16 16:10:20 -05:00
Nick Mathewson
3baf99e81b
Merge branch 'ticket28668_035' into ticket28668_040
2019-01-16 15:54:31 -05:00
Nick Mathewson
f684cd8005
Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
...
Closes ticket 28668.
2019-01-16 15:47:33 -05:00
Nick Mathewson
16430fdaf5
Merge branch 'maint-0.3.5'
2019-01-16 14:43:53 -05:00
Kris Katterjohn
f0408b844f
Add changes file for bug 28981
...
The fix was in commit 61636ad989de674698601284957dacde53cc4984.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-16 14:40:31 -05:00
Nick Mathewson
0981ac4c59
Log more messages when failing to decode RSA keys
...
We log these messages at INFO level, except when we are reading a
private key from a file, in which case we log at WARN.
This fixes a regression from when we re-wrote our PEM code to be
generic between nss and openssl.
Fixes bug 29042, bugfix on 0.3.5.1-alpha.
2019-01-16 14:35:30 -05:00
Nick Mathewson
49062d72b5
Start on 0.4.0.1-alpha changelog
2019-01-16 08:28:07 -05:00
Nick Mathewson
139202174b
Remove changes entries that appeared in 0.3.5.7
2019-01-16 08:20:12 -05:00
Nick Mathewson
2dd23086f1
Remove fallback scripts and whitelist
...
They have been extracted to a new fallback-scripts.git repository.
Closes ticket 27914.
2019-01-15 19:20:25 -05:00
Mike Perry
6440fdb8de
Changes file for Ticket 28142.
2019-01-15 22:53:03 +00:00
Nick Mathewson
9a61d3f5ad
Merge branch 'bug24953_squashed'
2019-01-15 08:25:35 -05:00
rl1987
7fbe7a2563
In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'
2019-01-15 08:25:29 -05:00
Nick Mathewson
c281e587bb
Merge branch 'ticket28058_squashed'
2019-01-15 08:08:41 -05:00
rl1987
30a925fe96
Add changes file
2019-01-15 08:08:29 -05:00
Nick Mathewson
691dec5d46
Merge branch 'maint-0.3.5'
2019-01-14 14:02:42 -05:00
rl1987
9d9e71824c
Rework rep_hist_log_link_protocol_counts()
2019-01-14 14:01:55 -05:00
Nick Mathewson
cef910642e
Merge branch 'bug28989_squashed'
2019-01-11 18:56:57 -05:00
rl1987
1bcececdd8
Fix CID 1442277
2019-01-11 18:56:48 -05:00
Nick Mathewson
d21fa48cac
Merge branch 'maint-0.3.5'
2019-01-11 18:53:24 -05:00
Nick Mathewson
efd765a948
Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5
2019-01-11 18:53:18 -05:00
teor
89a0b77740
rend: stop warning when clients send multiple rend establish cells
...
Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.
Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-10 07:59:59 +10:00
Nick Mathewson
2f0e187191
Merge remote-tracking branch 'tor-github/pr/627'
2019-01-09 15:46:14 -05:00
Nick Mathewson
578a93bbbc
Merge branch 'ticket28843'
2019-01-09 09:49:25 -05:00
Nick Mathewson
0ed966fde1
Merge branch 'maint-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
d890ec29aa
Merge branch 'maint-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
3df1d29d9b
Merge branch 'bug28591_035_squashed'
2019-01-09 09:33:31 -05:00
teor
44db455cc8
Dir: allow directory mirrors to serve future consensuses
...
When Tor's clock is behind the clocks on the authorities, allow Tor to
serve future consensuses.
Fixes bug 28654; bugfix on 0.3.0.1-alpha.
2019-01-09 09:32:28 -05:00
Nick Mathewson
e6a4401200
Merge branch 'maint-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
Nick Mathewson
a891d81c5f
Changes file for 28856
2019-01-09 08:48:11 -05:00
teor
85c598cbc2
stats: Make PaddingStatistics depend on ExtraInfoStatistics
...
When ExtraInfoStatistics is 0, stop including PaddingStatistics in
relay and bridge extra-info documents.
Fixes bug 29017; bugfix on 0.3.1.1-alpha.
2019-01-08 18:21:10 +10: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
0402746a99
Merge remote-tracking branch 'rl1987/doc28805'
2019-01-07 08:51:37 -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
fe26e1f1c8
Merge branch '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
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
Nick Mathewson
af85a0f28f
Remove from master those changes files that will appear in 0.3.5.7 or earlier.
2019-01-04 15:04:00 -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
98a1b8770c
Merge branch 'maint-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
a7cbbf279e
Merge branch 'ticket28852'
2019-01-03 21:31:08 -05:00
Nick Mathewson
9ba690e33f
Merge branch 'maint-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
47176eb678
Merge branch 'maint-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
27853938a1
Merge branch 'maint-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
rl1987
dbf1725a13
Completely remove 'GETINFO status/version/num-{concurring,versioning}'
2019-01-03 10:36:38 +02:00
Nick Mathewson
3e7f13a4ef
Merge branch 'maint-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
eaaeaf7933
Merge branch 'maint-0.3.5'
2019-01-02 16:09:20 -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
rl1987
8eadfad71d
Tweak ControlPort description in manpage
2018-12-23 19:58:25 +02:00
Nick Mathewson
99713b176b
Merge branch 'maint-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
Nick Mathewson
70dd6d07bb
Merge branch 'orconn-tracker_squashed'
2018-12-21 14:22:11 -05:00
Taylor Yu
2100b35f07
changes file for ticket27167
2018-12-21 14:15:35 -05:00
Nick Mathewson
ab4395d082
Merge branch 'ticket28847'
2018-12-21 13:26:47 -05:00
Alexander Færøy
cf4b3dbd44
Use the subsystem list to initialize and shutdown process module.
...
This patch makes the process module use the subsystem list for
initializing and shutting down.
See: https://bugs.torproject.org/28847
2018-12-21 13:26:38 -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
e4109020e9
Merge remote-tracking branch 'tor-github/pr/609'
2018-12-20 16:42:35 -05:00
Nick Mathewson
0e6e902cbc
Merge branch 'document_--version'
2018-12-20 11:50:48 -05:00
Nick Mathewson
973a5db808
Merge remote-tracking branch 'tor-github/pr/445'
2018-12-20 07:53:57 -05:00
Nick Mathewson
9c6283732a
Merge branch 'maint-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
Alexander Færøy
e2c36b9ca0
Add and update changes files for #28846 .
...
This ticket finishes the implementatoin of #28180 and adds the new
STATUS message from #28846 .
See: https://bugs.torproject.org/28846
2018-12-20 04:08:04 +01: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
1c47459e5a
Merge branch 'maint-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
ed0bc85ed0
Merge branch 'ticket28853'
2018-12-18 18:59:56 -05:00
Nick Mathewson
bb091da1e7
Merge branch 'ticket28839_v2_squashed'
2018-12-18 18:59:05 -05:00
Nick Mathewson
976c62e62a
Changes file for ticket28839
2018-12-18 18:58:08 -05:00
Nick Mathewson
372df7a630
Merge branch 'maint-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
0af0f78dff
Merge branch 'maint-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
a3e6f2467b
Merge remote-tracking branch 'tor-github/pr/595'
2018-12-18 13:51:21 -05:00
Nick Mathewson
872998dd00
Merge branch 'ticket28179_squashed_merged'
2018-12-18 13:36:34 -05:00
Alexander Færøy
44a80bb361
Add missing changes files for #26360 , #28179 , #28180 .
...
See: https://bugs.torproject.org/26179
See: https://bugs.torproject.org/28180
See: https://bugs.torproject.org/28360
2018-12-18 13:36:08 -05:00
Nick Mathewson
90187b1bfc
Remove changes that are already merged in 0.3.5.x releases
2018-12-18 08:15:38 -05:00
Nick Mathewson
c61cd5775c
Revert "Log bootstrap tag names"
...
This reverts commit 1b855af5e3
.
2018-12-18 08:09:43 -05:00
Nick Mathewson
508837b62b
Document the output of --version
...
Closes 28889
2018-12-17 17:54:01 -05:00
Nick Mathewson
5a22b42c3a
Merge branch 'maint-0.3.5'
2018-12-17 10:57:51 -05:00