Nick Mathewson
0e790bb40d
Merge branch 'maint-0.3.2'
2017-12-20 12:15:24 -05:00
Nick Mathewson
c604a76a53
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-20 12:15:23 -05:00
Nick Mathewson
877dd1d6c8
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-20 12:15:23 -05:00
Karsten Loesing
428f8a375b
Update geoip and geoip6 to the December 6 2017 database.
2017-12-20 17:36:29 +01:00
Nick Mathewson
a499be33b8
Merge branch 'maint-0.3.2'
2017-12-20 11:19:23 -05:00
Nick Mathewson
565ec6100f
Merge branch 'stack_again_032' into maint-0.3.2
2017-12-20 11:19:18 -05:00
Nick Mathewson
7ca0a9c4ae
Merge remote-tracking branch 'ahf-oniongit/bugs/24605'
2017-12-20 11:16:17 -05:00
Nick Mathewson
c99ec36def
expand documentation on tor_remove_file
2017-12-20 10:43:27 -05:00
Nick Mathewson
4b7b305bf0
Remove pre-unlink check tor_remove_file; check errno instead.
...
This removes a time-of-check/time-of-use issue, though in this case
it would probably be harmless.
2017-12-20 10:42:02 -05:00
Nick Mathewson
18543c2c9b
Merge remote-tracking branch 'ffmancera/github/bug23271'
2017-12-20 10:40:32 -05:00
Nick Mathewson
3bc5806339
Merge branch 'maint-0.3.2'
2017-12-20 10:39:38 -05:00
Nick Mathewson
0a1b1430c8
Update the unit tests to reflect the change of 24425
2017-12-20 10:39:19 -05:00
Nick Mathewson
8e5450b752
Remove merge-conflict detritus
2017-12-20 10:15:00 -05:00
Nick Mathewson
f92b533757
Merge remote-tracking branch 'teor/ticket24682'
2017-12-20 10:14:43 -05:00
Nick Mathewson
83ced3e7fe
Merge branch 'maint-0.3.2'
2017-12-20 09:59:51 -05:00
Nick Mathewson
fc33caadae
Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2
2017-12-20 09:59:06 -05:00
Nick Mathewson
accd0ea65b
Fix the clz32 and clz64 settings on MSVC.
...
Fixes bug 24633; bugfix on 0.2.9.1-alpha.
2017-12-20 09:37:18 -05:00
Nick Mathewson
28fbfa8712
whitespace fix
2017-12-20 09:17:13 -05:00
Nick Mathewson
69a320ce5d
Merge branch 'xfer_time_coarse'
2017-12-20 09:15:30 -05:00
Nick Mathewson
60bf8f6cf6
Improve add_msec test to cover ms->sec rollover
...
Per mikeperry's suggestion, I'm making sure that the millisecond
part of the time will always roll over in this test.
2017-12-20 09:12:38 -05:00
teor
1a29ad611c
Make fallback script usage instructions create a log file
...
Comment-only change.
Closes 24682.
2017-12-20 12:36:31 +11:00
Nick Mathewson
d43dc120e8
finish documentation on live_consensus_is_missing
2017-12-18 15:01:05 -05:00
Alexander Færøy
d4f4108601
Add MainloopStats option.
...
This patch adds support for MainloopStats that allow developers to get
main event loop statistics via Tor's heartbeat status messages. The new
status log message will show how many succesful, erroneous, and idle
event loop iterations we have had.
See: https://bugs.torproject.org/24605
2017-12-16 02:41:21 +01:00
Alexander Færøy
e44662a7f9
Fix additional whitespace in config module comment.
2017-12-16 02:22:37 +01:00
Nick Mathewson
93e7b837c8
Use same macros to simplify options_transition_affects_*
2017-12-15 15:33:29 -05:00
Nick Mathewson
376f97aaa1
Simplify the very repetitious options_transition_allowed()
2017-12-15 15:32:46 -05:00
Nick Mathewson
424572ee0a
please lintchanges
2017-12-15 12:53:01 -05:00
Nick Mathewson
20f802ea3c
Add an option to disable signal handler installation.
...
Closes ticket 24588.
2017-12-15 12:48:29 -05:00
Nick Mathewson
fdd5734875
Remove the unused is_parent==0 option from handle_signals.
2017-12-15 12:45:30 -05:00
Nick Mathewson
a61c36d53a
indentation fix
2017-12-15 12:37:15 -05:00
Fernando Fernandez Mancera
61c721f145
Add remove file function and remove ephemeral files.
...
Adding tor_remove_file(filename) and refactoring tor_cleanup().
Removing CookieAuthFile and ExtORPortCookieAuthFile when tor_cleanup() is
called.
Fixes #23271 .
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2017-12-15 17:01:22 +01:00
Nick Mathewson
519c6ba26c
Merge remote-tracking branch 'isis/bug24612'
2017-12-15 10:59:57 -05:00
Nick Mathewson
db4873c46d
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump
2017-12-14 14:12:41 -05:00
Nick Mathewson
5c4da2cacd
bump to 0.3.2.7-rc-dev
2017-12-14 14:12:31 -05:00
Nick Mathewson
d7aab158d0
forward-port the 0.3.2.7-rc changelog
2017-12-14 14:07:04 -05:00
Nick Mathewson
102b4f3a92
remove changes files that will appear in 0.3.2.7-rc
2017-12-13 12:08:52 -05:00
Nick Mathewson
9b71469773
Merge branch 'maint-0.3.2'
2017-12-13 12:07:46 -05:00
Nick Mathewson
ca8e9813bf
vim sometimes makes swo tempfiles
2017-12-13 12:07:45 -05:00
Nick Mathewson
1fb3d37c08
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2017-12-13 12:06:43 -05:00
Nick Mathewson
93b3c4b844
update to 0.3.2.7-rc
2017-12-13 12:06:37 -05:00
Nick Mathewson
f7e393eb4c
Another attempt at fixing the STACK warning in tortls.c
...
Patch suggestion from catalyst.
Related to 24423
2017-12-13 10:09:10 -05:00
Nick Mathewson
8441189b3c
Changes file for 24374, merged earlier.
2017-12-13 09:50:57 -05:00
Nick Mathewson
219c969d7b
Use monotime_coarse for transfer times and padding times
...
Using absolute_msec requires a 64-bit division operation every time
we calculate it, which gets expensive on 32-bit architectures.
Instead, just use the lazy "monotime_coarse_get()" operation, and
don't convert to milliseconds until we absolutely must.
In this case, it seemed fine to use a full monotime_coarse_t rather
than a truncated "stamp" as we did to solve this problem for the
timerstamps in buf_t and packed_cell_t: There are vastly more cells
and buffer chunks than there are channels, and using 16 bytes per
channel in the worst case is not a big deal.
There are still more millisecond operations here than strictly
necessary; let's see any divisions show up in profiles.
2017-12-13 09:46:58 -05:00
Nick Mathewson
dd6dec2665
Add a function to add msec to a monotime.
...
We'll use this for the channel padding logic.
2017-12-13 08:54:29 -05:00
Nick Mathewson
4c877ae874
Add monotime functions for clearing monotonic times
...
We need this to replace some of our "msec" users with monotime
users.
2017-12-13 08:29:23 -05:00
Isis Lovecruft
c7dc65e033
build: Add pretty printing of results of rust autoconf checks.
...
* ADDS several `AC_MSG_RESULT`s which print the result of our checks
for our rust dependencies and a check for a suitable rustc compiler
version.
* FIXES #24612 : https://bugs.torproject.org/24612
2017-12-13 02:27:02 +00:00
Nick Mathewson
426110dfa2
Merge branch 'maint-0.3.2'
2017-12-12 19:46:53 -05:00
Nick Mathewson
15b41fa6ae
Make sandbox.c compile when libseccomp-dev is installed on arm64
...
Fixes ticket 24424. Patch from weasel.
2017-12-12 19:46:03 -05:00
Nick Mathewson
9abef516f6
Merge branch 'maint-0.3.2'
2017-12-12 19:27:14 -05:00
Nick Mathewson
bf89b08930
Merge branch 'bug24367_032_squashed' into maint-0.3.2
2017-12-12 19:17:38 -05:00
