Nick Mathewson
3e68db02c4
In ntmain, call set_main_thread() before running the loop.
...
Patch from Vort; fixes bug 23081; bugfix on fd992deeea
2017-08-03 09:09:08 -04:00
Nick Mathewson
2624cd63ee
add changes file for STRUCT_OFFSET removeal (22521)
2017-08-03 08:57:52 -04:00
Neel Chauhan
5ee6ca8da2
Switch to offsetof()
2017-08-03 08:56:35 -04:00
Nick Mathewson
02fcb29d11
Merge branch 'maint-0.3.1'
2017-08-03 08:44:32 -04:00
Nick Mathewson
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
Nick Mathewson
9696021593
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-03 08:44:31 -04:00
Nick Mathewson
f33c96610f
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-03 08:44:31 -04:00
Nick Mathewson
e220e6e437
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 08:44:31 -04:00
Karsten Loesing
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
David Goulet
5b03c7ba6d
Fix check_expired_networkstatus_callback() if condition
...
The condition was always true meaning that we would reconsider updating our
directory information every 2 minutes.
If valid_until is 6am today, then now - 24h == 1pm yesterday which means that
"valid_until < (now - 24h)" is false. But at 6:01am tomorrow, "valid_until <
(now - 24h)" becomes true which is that point that we shouldn't trust the
consensus anymore.
Fixes #23091
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-02 13:28:45 -04:00
Nick Mathewson
c4c5077af2
Merge branch 'maint-0.3.1'
2017-08-02 12:51:46 -04:00
Nick Mathewson
a9a8d53dec
Merge branch 'bug23071_031' into maint-0.3.1
2017-08-02 12:51:42 -04:00
Nick Mathewson
ee849ee8b6
Make the hs_ntor_ref logic more correct when there is no sha3 module
2017-08-02 12:44:46 -04:00
Nick Mathewson
706364238e
Merge branch 'maint-0.3.1'
2017-08-02 12:29:42 -04:00
Nick Mathewson
ebce26b5cb
Forward-port 0.3.0.10 changelog
2017-08-02 12:29:40 -04:00
Nick Mathewson
830b7b31b5
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid version bump.
2017-08-02 12:28:43 -04:00
Nick Mathewson
8925e84beb
version bump to 0.3.0.10-dev
2017-08-02 12:28:34 -04:00
Nick Mathewson
256c1b73e3
Merge branch 'maint-0.3.1'
2017-08-01 14:39:08 -04:00
Nick Mathewson
71248800f7
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"Ours merge" to avoid version bump.
2017-08-01 14:38:57 -04:00
Nick Mathewson
4f7955d5de
Bump to 0.3.0.10
2017-08-01 14:38:49 -04:00
David Goulet
ff9c529667
hs: Cleanup logging statement in hs_intropoint.c
...
One log statement was a warning and has been forgotten. It is triggered for a
successful attempt at introducting from a client.
It has been reported here:
https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html
Three other log_warn() statement changed to protocol warning because they are
errors that basically can come from the network and thus triggered by anyone.
Fixes #23078 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-01 14:15:47 -04:00
Nick Mathewson
c1edd83dd4
forward-port 0.3.1.5-alpha changelog
2017-08-01 12:20:23 -04:00
Nick Mathewson
370a2b9fd1
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid version bump.
2017-08-01 12:08:53 -04:00
Nick Mathewson
9c294d29ea
bump to 0.3.1.5-alpha-dev
2017-08-01 12:08:30 -04:00
Nick Mathewson
e72734959b
Remove one more changes file for item already in release-0.3.1
2017-08-01 11:31:52 -04:00
Nick Mathewson
4d26203528
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:30:33 -04:00
Nick Mathewson
b2d528d3be
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:30:33 -04:00
Nick Mathewson
39ade001a7
Merge branch 'maint-0.3.1'
2017-08-01 11:30:33 -04:00
Nick Mathewson
58e1c6dd86
Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9
2017-08-01 11:30:29 -04:00
Nick Mathewson
751c718273
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:28:40 -04:00
Nick Mathewson
ba7d6a1e14
Merge branch 'maint-0.3.1'
2017-08-01 11:28:40 -04:00
Nick Mathewson
f69797b67c
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:28:39 -04:00
Nick Mathewson
8500f0e4e1
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
2017-08-01 11:28:36 -04:00
Nick Mathewson
bf91b6e05f
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:24:09 -04:00
Nick Mathewson
2ee1a084f2
Merge branch 'maint-0.3.1'
2017-08-01 11:24:09 -04:00
Nick Mathewson
84c4a2bc3f
Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
2017-08-01 11:24:02 -04:00
Nick Mathewson
9b65d7f415
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:23:01 -04:00
Nick Mathewson
069728bdd7
Merge branch 'maint-0.3.1'
2017-08-01 11:23:01 -04:00
Nick Mathewson
7c68b2f1a5
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:23:00 -04:00
Nick Mathewson
2b94b0ea72
Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
2017-08-01 11:22:42 -04:00
Nick Mathewson
5a739e59a4
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:21:19 -04:00
Nick Mathewson
a05ceaaeb6
Merge branch 'maint-0.3.1'
2017-08-01 11:21:19 -04:00
Nick Mathewson
1d48712c28
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:21:19 -04:00
Nick Mathewson
f6ecda8400
Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9
2017-08-01 11:21:14 -04:00
Nick Mathewson
4a19498edc
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-01 11:19:30 -04:00
Nick Mathewson
64e5600103
Merge branch 'maint-0.3.1'
2017-08-01 11:19:30 -04:00
Nick Mathewson
9d24a352c0
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-08-01 11:19:30 -04:00
Nick Mathewson
0e7558ab64
Merge branch 'maint-0.2.7-redux' into maint-0.2.8
2017-08-01 11:19:29 -04:00
Nick Mathewson
925ef048a9
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-08-01 11:19:29 -04:00
Nick Mathewson
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
