Nick Mathewson
8f8a061b0c
Merge branch 'maint-0.3.1'
2017-08-21 15:08:17 -04:00
Nick Mathewson
10b2428224
Merge branch 'bug23291_028' into maint-0.3.1
2017-08-21 15:06:39 -04:00
Nick Mathewson
b943cedf34
changes file for bug 23291
2017-08-21 15:04:35 -04:00
Nick Mathewson
6f3208670a
Merge branch 'maint-0.3.1'
2017-08-21 14:20:38 -04:00
George Kadianakis
1491c0d024
Fix triggerable BUG() when decoding hsv3 descriptors.
...
Also improve the unittest to make sure it catches the right error.
2017-08-21 19:16:45 +03:00
Nick Mathewson
efbd4a33f4
Raise MIN_DL_PER_REQUEST to 32
...
This change should improve overhead for downloading small numbers of
descriptors and microdescriptors by improving compression
performance and lowering directory request overhead.
Closes ticket 23220.
2017-08-11 13:54:01 -04:00
Nick Mathewson
a368cadf95
Merge branch 'bug18982'
2017-08-11 12:11:42 -04:00
Nick Mathewson
6247f5a5ba
Merge branch 'maint-0.3.1'
2017-08-11 11:51:06 -04:00
Nick Mathewson
133e1e870b
Merge remote-tracking branch 'dgoulet/bug23091_032_01'
2017-08-11 09:39:57 -04:00
Nick Mathewson
d655388a4a
Document all the arguments of PublishServerDescriptor.
...
Implements 15645.
2017-08-09 11:17:27 -04:00
Nick Mathewson
72832086e2
Use a single free-and-exit strategy in config_process_include.
...
This avoids a double-free when a pointer already freed with
tor_free(config_line) is freed again in the cleanup-and-exit code.
Fixes bug 23155.
2017-08-08 20:08:43 -04:00
Nick Mathewson
b08a2dc954
Merge branch 'maint-0.3.1'
2017-08-08 19:29:10 -04:00
Nick Mathewson
a47b8fcf92
Merge branch 'bug23139' into maint-0.3.1
2017-08-08 19:29:05 -04:00
Nick Mathewson
48a57f9815
Merge branch 'maint-0.3.1'
2017-08-08 10:10:52 -04:00
Nick Mathewson
5368eaf62b
chages file on 22286
2017-08-08 10:09:54 -04:00
Nick Mathewson
3af4aafbcb
Fix a memory leak in consdiffmgr.c
...
Fixes bug 23139; bugfix on 0.3.1.1-alpha.
2017-08-08 09:13:45 -04:00
cypherpunks
0265ced02b
Remove usage of the PATH_MAX variable
...
GNU Hurd does not define the PATH_MAX variable. Using the variable on
this platform results in compilation errors.
Closes #23098 .
2017-08-04 12:22:53 -04:00
Isis Lovecruft
b2a7e8df90
routerkeys: Add cmdline option for learning signing key expiration.
...
* CLOSES #17639 .
* ADDS new --key-expiration commandline option which prints when the
signing key expires.
2017-08-03 22:20:02 +00:00
Nick Mathewson
fabc3deb75
Merge branch 'bug20152'
2017-08-03 10:11:44 -04:00
Nick Mathewson
96cf608b2e
Merge branch 'bug22885_squashed'
2017-08-03 09:33:40 -04:00
Nick Mathewson
7f32920648
Don't send missing X-Desc-Gen-Reason on startup
...
Since we start with desc_clean_since = 0, we should have been
starting with non-null desc_dirty_reason.
Fixes bug 22884; bugfix on 0.2.3.4-alpha when X-Desc-Gen-Reason was
added.
2017-08-03 09:33:33 -04:00
Nick Mathewson
1168e21b45
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-08-03 09:14:12 -04:00
Nick Mathewson
40c7871f46
Merge branch 'maint-0.3.1'
2017-08-03 09:14:12 -04:00
Nick Mathewson
b548371f76
Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0
2017-08-03 09:12:23 -04:00
Nick Mathewson
17073d7234
Merge branch 'maint-0.3.1'
2017-08-03 09:11:03 -04:00
Nick Mathewson
b13bf65062
Merge branch 'bug23081_025' into maint-0.3.1
2017-08-03 09:10:58 -04:00
Nick Mathewson
3e68db02c4
In ntmain, call set_main_thread() before running the loop.
...
Patch from Vort; fixes bug 23081; bugfix on fd992deeea
in
0.2.1.16-rc when set_main_thread() was introduced.
See the changes file for a list of all the symptoms this bug has
been causing when running Tor as a Windows Service.
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
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
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
Nick Mathewson
9696021593
Merge branch 'maint-0.2.8' into maint-0.2.9
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
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
e72734959b
Remove one more changes file for item already in release-0.3.1
2017-08-01 11:31:52 -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
8500f0e4e1
Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9
2017-08-01 11:28:36 -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
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
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