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
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
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
