Commit Graph

1150 Commits

Author SHA1 Message Date
selsta b0ec9f85a1
epee: avoid ADL selecting C++14 std::quoted 2021-10-20 19:30:21 +02:00
luigi1111 7f1a44679c
Merge pull request #7971
b00e21d cmake: set cpp14 standard (selsta)
2021-10-17 23:33:33 -05:00
Howard Chu 69c09ad204
Add README to release archives
Also add docs/ANONYMITY_NETWORKS.md
Even though there is no "docs" dir in the archive...
2021-10-14 15:30:43 +01:00
luigi1111 8fa21beba1
Merge pull request #7912
ae41178 gitian: cleanup more unused packages (Howard Chu)
4ea7832 gitian: omit ccache from gitian builds (Howard Chu)
2021-10-11 12:56:53 -05:00
selsta 49441d4a2a
depends: update zeromq package to 4.3.4 2021-10-10 12:11:01 +02:00
Howard Chu ae41178c8b
gitian: cleanup more unused packages
These appear to be leftovers inherited from Bitcoin's builder
2021-09-27 17:14:03 +01:00
Howard Chu 4ea7832ea7
gitian: omit ccache from gitian builds
It's just wasted overhead since the build VMs are always deleted
and recreated fresh for each run.
2021-09-27 17:14:03 +01:00
selsta b00e21dccc
cmake: set cpp14 standard
It's 2021, we can easily switch to C++14 without any troubles.
2021-09-25 06:22:12 +02:00
luigi1111 6b824c9ed0
Merge pull request #7945
4afd9a7 cmake: set required C/C++ standard to 11 (selsta)
2021-09-23 22:22:42 -05:00
luigi1111 415e290675
Merge pull request #7933
43a7279 depends: update unwind, fix build with ubuntu 21.04 (selsta)
2021-09-23 22:19:50 -05:00
luigi1111 29e3d0aa87
Merge pull request #7911
acef6c9 Fix parallel make of OpenSSL (Howard Chu)
2021-09-23 22:14:41 -05:00
selsta 4afd9a7a9e
cmake: set required C/C++ standard to 11
Co-authored-by: Jason Rhinelander <jason@imaginary.ca>
2021-09-16 10:44:25 +02:00
selsta 43a72790ab
depends: update unwind, fix build with ubuntu 21.04 2021-09-11 20:25:43 +02:00
luigi1111 c278c97f1f
Merge pull request #7884
ec6b4cf support cors wildcard (woodser)
2021-09-09 15:20:09 -04:00
luigi1111 aa8320671c
Merge pull request #7858
426dbf4 fix median overflow bug (koe)
2021-09-09 15:17:06 -04:00
luigi1111 2a02cd0a5f
Merge pull request #7773 from selsta/unbound
external: remove unbound submodule
2021-09-09 15:13:06 -04:00
Howard Chu 4571d3686d
Add simple script for running gitian-build
This shell script creates a docker image for running the gitian-build.py
script, to avoid version incompatibilities. The builds may be signed
automatically after manually reviewing the build hashes.

Only docker.io and apt-cacher-ng are required to be installed on the
host. The MacOSX SDK should also be present in this directory if Mac
builds are desired. A container named "gitrun" is used to launch
the builds, and all output will reside in this container as well.
2021-09-04 17:20:29 +01:00
selsta ae85ec0285
external: remove unbound submodule 2021-09-03 07:47:35 +02:00
Howard Chu acef6c955b
Fix parallel make of OpenSSL 2021-08-31 04:38:38 +01:00
luigi1111 3673a679e4
Merge pull request #7850
0ac9a04 epee: tidying post-incrementation -> pre-incrementation (mj-xmr)
2021-08-26 21:12:25 -04:00
luigi1111 2d3ce2d64a
Merge pull request #7881
301355f epee: link with Boost_SYSTEM_LIBRARY (selsta)
2021-08-20 16:51:18 -04:00
luigi1111 294d58c58d
Merge pull request #7832
d8e71c8 CMake: ccache fix for FreeBSD at 'depends' (mj-xmr)
2021-08-20 16:40:04 -04:00
woodser ec6b4cf9e1 support cors wildcard 2021-08-20 14:17:51 -04:00
selsta 301355f88d
epee: link with Boost_SYSTEM_LIBRARY 2021-08-19 19:05:40 +02:00
koe 426dbf434b fix median overflow bug 2021-08-13 06:57:27 -05:00
luigi1111 0b4e922159
Merge pull request #7812
bf96055 Make SSL key/cert storage backward-compatible (Nathan Dorfman)
2021-08-11 22:38:24 -04:00
luigi1111 521b4d9ded
Merge pull request #7809
7354ffb p2p: remove blocked addresses/hosts from peerlist (moneromooo-monero)
2021-08-11 22:35:15 -04:00
mj-xmr 0ac9a04b4c
epee: tidying post-incrementation -> pre-incrementation 2021-08-11 16:47:32 +02:00
moneromooo-monero 7354ffb8a7
p2p: remove blocked addresses/hosts from peerlist 2021-08-05 17:29:25 +00:00
mj-xmr d8e71c8dbe
CMake: ccache fix for FreeBSD at 'depends' 2021-08-04 20:05:42 +02:00
Nathan Dorfman bf96055211 Make SSL key/cert storage backward-compatible
This is required to build on OpenBSD (which uses LibreSSL). It also allows building against versions of OpenSSL before 1.0.2.
2021-07-27 13:49:21 -06:00
selsta 09779631f3
depends: add getmonero package mirror 2021-07-01 01:09:00 +02:00
mj-xmr c19f0cbdea
Compil time: move epee storages/parserse_base_utils.h to parserse_base_utils.cpp 2021-06-11 21:20:51 +02:00
luigi1111 7499837a6f
Merge pull request #7661
08e4497 Improve cryptonote (block and tx) binary read performance (Lee Clagett)
2021-06-10 12:00:54 -05:00
luigi1111 25bbb26f63
Merge pull request #7416
b4fe7c2 epee linkage dynamic; move monero_add_library to main CMakeLists.txt (mj-xmr)
2021-06-10 11:18:26 -05:00
luigi1111 1c8e598172
Merge pull request #7735
44cc6d6 Fix boost 1.76.0 compatibility (loqs)
2021-06-01 22:12:12 -05:00
luigi1111 d51e0c38f9
Merge pull request #7712
d772f13 epee: include public openssl header in cmake (selsta)
2021-06-01 22:08:15 -05:00
luigi1111 39cd392ac3
Merge pull request #7710
9165344 CI: depends downloads relax retries (mj-xmr)
2021-06-01 22:07:21 -05:00
loqs 44cc6d6762
Fix boost 1.76.0 compatibility
Add missing header boost/mpl/contains.hpp
monero-project/monero/issues/7728
2021-05-24 05:31:14 +02:00
luigi1111 b7ee587ddb
Merge pull request #7691
cbd54ea cmake: set 3.5 as minimum version (selsta)
2021-05-12 16:59:17 -05:00
luigi1111 c1a1f2a6ea
Merge pull request #7688
451b5a5 clang: fix -Wrange-loop-analysis warnings (selsta)
2021-05-12 16:57:32 -05:00
luigi1111 ea5c99f142
Merge pull request #7685
8c3c7b8 depends, docker: fix bintray links (selsta)
2021-05-12 15:32:16 -05:00
luigi1111 ac87ac19b2
Merge pull request #7665
15e6275 CMake: new macro - finding all headers (extract from epee) (mj-xmr)
2021-05-12 14:39:39 -05:00
selsta d772f1378b
epee: include public openssl header in cmake 2021-05-09 22:22:17 +02:00
mj-xmr 9165344d8e
CI: depends downloads relax retries 2021-05-08 18:00:53 +02:00
selsta cbd54ea524
cmake: set 3.5 as minimum version 2021-04-27 11:02:05 +02:00
selsta 8c3c7b8109
depends, docker: fix bintray links 2021-04-27 09:55:32 +02:00
selsta 451b5a510e
clang: fix -Wrange-loop-analysis warnings 2021-04-27 05:30:27 +02:00
mj-xmr b4fe7c2401 epee linkage dynamic; move monero_add_library to main CMakeLists.txt 2021-04-24 09:45:51 +02:00
luigi1111 0a1ddc2eff
Merge pull request #7669
679d055 Remove payload copy in all outgoing p2p messages (Lee Clagett)
2021-04-22 01:51:01 -04:00
luigi1111 b6a8cfc41b
Merge pull request #7658
834e23b Doc: Update Gitian (Reproducible Builds) with small code snippets and fixes (mj-xmr)
2021-04-22 01:46:57 -04:00
luigi1111 6d7bb2b8ba
Merge pull request #7643
19ed7ab Test: Enable coverage for external repositories (mj-xmr)
2021-04-22 01:34:26 -04:00
mj-xmr dc81e23e60 Split epee/string_tools.h and encapsulate boost::lexical_cast 2021-04-16 20:54:20 +02:00
luigi1111 e45619e61e Revert "Merge pull request #7136"
This reverts commit 63c7ca07fb, reversing
changes made to 2218e23e84.
2021-04-16 13:52:44 -05:00
luigi1111 257e7432cb
Merge pull request #7652
02f4954 gitian: remove osslsigncode (selsta)
2021-04-16 12:52:05 -05:00
luigi1111 63c7ca07fb
Merge pull request #7136
23aae55 Remove payload copy in all outgoing p2p messages (Lee Clagett)
2021-04-16 12:45:30 -05:00
luigi1111 2218e23e84
Merge pull request #7002
673c6d2 Reduce compilation time of epee/portable_storage_template_helper.h (mj-xmr)
2021-04-16 12:43:42 -05:00
mj-xmr 15e627569b CMake: new macro - finding all headers (extract from epee) 2021-04-16 09:28:43 +02:00
mj-xmr 834e23bfcf Doc: Update Gitian (Reproducible Builds) with small code snippets and fixes 2021-04-11 23:19:38 +02:00
selsta 02f4954229
gitian: remove osslsigncode
Unused and archive is offline
2021-04-08 02:25:33 +02:00
mj-xmr 19ed7abdf9 Test: Enable coverage for external repositories
Add monero_enable_coverage() for reuse in case C/CXX_FLAGS are overwritten.
2021-04-01 19:50:54 +02:00
mj-xmr e8554e8c49 Doc: Add ccache to README.md and Brewfile 2021-03-30 06:13:20 +02:00
luigi1111 08f6d0e185
Merge pull request #7439
0f2b5af Reduced executable size; reduced call sequence to 'allowed' log function (Lee Clagett)
2021-03-29 22:39:31 -04:00
luigi1111 07dc1a8db3
Merge pull request #7636
18c7f9c depends: openssl 1.1.1i -> 1.1.1k (selsta)
2021-03-29 21:59:36 -04:00
luigi1111 a2b046dafc
Merge pull request #7460
2935a0c async_protocol_handler_config: fix deadlock (anon)
c877705 async_protocol_handler_config: add deadlock demo (anon)
2021-03-29 21:46:29 -04:00
mj-xmr 673c6d2d11 Reduce compilation time of epee/portable_storage_template_helper.h 2021-03-28 15:41:48 +02:00
selsta 18c7f9c446
depends: openssl 1.1.1i -> 1.1.1k 2021-03-25 21:38:57 +01:00
luigi1111 f2f33f6230
Merge pull request #7402
240d382 Epee: add headers to project files (via glob), to be able to search for them easily. (mj-xmr)
2021-03-20 01:46:34 -04:00
luigi1111 4a7b729025
Merge pull request #7394
b900fa0 Fix compiler warning for in keyvalue_serialization.h (mj-xmr)
2021-03-20 01:43:13 -04:00
luigi1111 602926fe9d
Merge pull request #7366
9867a91 Store RPC SSL key/cert for consistent authentication between runs (Lee Clagett)
2021-03-20 01:38:03 -04:00
luigi1111 6e1b3d1e0b
Merge pull request #7274
daf023d epee: don't log raw packet data (moneromooo-monero)
2021-03-20 01:35:51 -04:00
luigi1111 7bf89dcbd3
Merge pull request #7005
249eae5 Allow byte_stream->byte_slice conversion to shrink unused buffer space (Lee Clagett)
2021-03-20 01:35:13 -04:00
anon 2935a0c479
async_protocol_handler_config: fix deadlock 2021-03-12 11:59:06 +00:00
luigi1111 0b6bfb1fd8
Merge pull request #7399
556af11 epee: return HTTP error 400 (Bad request) on deserialization error (moneromooo-monero)
2021-03-05 13:56:54 -05:00
mj-xmr 240d382db4 Epee: add headers to project files (via glob), to be able to search for them easily.
Use case: IDEs
2021-02-25 20:16:02 +01:00
moneromooo-monero 556af11d3b
epee: return HTTP error 400 (Bad request) on deserialization error
It's better than 404 (Not found)
2021-02-23 18:55:08 +00:00
mj-xmr b900fa03c1 Fix compiler warning for in keyvalue_serialization.h 2021-02-21 18:35:06 +01:00
anon 80125a2f77
async_protocol_handler_config: remove connection correctly 2021-02-19 22:27:29 +00:00
luigi1111 33004ded62
Merge pull request #7343
545b982 Remove unnecessary atomic operations in levin code (Lee Clagett)
2021-02-18 14:02:52 -05:00
luigi1111 9f6dcbd568
Merge pull request #7308
df2f00f boosted_tcp_server: fix connection lifetime (anon)
3833624 boosted_tcp_server: add segfault demo (anon)
2021-02-15 21:53:43 -05:00
Lee Clagett 9867a913dc Store RPC SSL key/cert for consistent authentication between runs 2021-02-13 20:26:26 +00:00
mj-xmr dc48de74e8 Reduce compilation time of epee/portable_storage.h 2021-02-06 08:18:42 +01:00
Lee Clagett 08e4497c6e Improve cryptonote (block and tx) binary read performance 2021-01-23 06:23:39 +00:00
anon df2f00f44d boosted_tcp_server: fix connection lifetime 2021-01-19 18:15:30 +01:00
Lee Clagett 545b9825d6 Remove unnecessary atomic operations in levin code 2021-01-19 04:44:03 +00:00
Lee Clagett 679d05567d Remove payload copy in all outgoing p2p messages 2021-01-19 02:22:32 +00:00
Lee Clagett 0f2b5af0dd Reduced executable size; reduced call sequence to "allowed" log function 2021-01-16 22:55:41 +00:00
Lee Clagett 23aae5571b Remove payload copy in all outgoing p2p messages 2021-01-16 22:53:28 +00:00
luigi1111 cb21ec30a4
Merge pull request #7149
0660db3 fuzz_tests: add a test for utf8canonical (moneromooo-monero)
2021-01-15 23:47:49 -05:00
luigi1111 218981eba1
Merge pull request #7137
f2ad539 readline_buffer: Avoid consecutive duplicates in the history (codesoap)
2021-01-15 23:46:14 -05:00
moneromooo-monero 372754a66e
storages: overridable limits for loading portable_storage from binary 2021-01-07 20:24:29 +00:00
luigi1111 e144dd5b15
Merge pull request #7281
b9092dd epee: also limit number of strings in portable_storage (moneromooo-monero)
2021-01-06 21:11:09 -05:00
moneromooo-monero b9092ddb5c
epee: also limit number of strings in portable_storage
They require at least 24 bytes
2021-01-05 17:54:25 +00:00
Alexander Blair 7264d64856
Merge pull request #7263
b652d598d add a max levin packet size by command type (moneromooo-monero)
2021-01-03 18:23:57 -08:00
moneromooo-monero daf023de6e
epee: don't log raw packet data 2021-01-03 14:41:01 +00:00
moneromooo-monero b652d598d1
add a max levin packet size by command type 2021-01-03 14:07:45 +00:00
moneromooo-monero 5cd6fda1ee
portable_storage: better sanity checking 2021-01-02 12:34:28 +00:00
Alexander Blair 16c780d568
Merge pull request #7250
61b6e4cc6 Add aggressive restrictions to pre-handshake p2p buffer limit (Lee Clagett)
2021-01-01 22:35:59 -08:00
Alexander Blair 175aa2497a
Merge pull request #7243
8e2caf3fb portable_storage: check object limit where appropriate (moneromooo)
2021-01-01 22:32:53 -08:00
Alexander Blair 5917aec4a1
Merge pull request #7220
20bdbd7aa portable_storage: forbid unnamed sections (xiphon)
2021-01-01 22:28:21 -08:00
moneromooo 8e2caf3fb4
portable_storage: check object limit where appropriate
also fix pedantic off by one in check
2020-12-31 22:35:17 +00:00
Alexander Blair 88b7bc394e
Merge pull request #7218
353f93ee1 portable_storage: remove array element limit (moneromooo-monero)
2020-12-29 10:44:05 -08:00
Alexander Blair d4636a9258
Merge pull request #7207
f7ab8bc6d ssl: buffered handshake detection (anon)
2020-12-29 10:43:50 -08:00
xiphon 20bdbd7aab portable_storage: forbid unnamed sections 2020-12-28 23:51:25 +00:00
moneromooo-monero 353f93ee1a
portable_storage: remove array element limit
some people don't want it
2020-12-28 21:04:58 +00:00
anon f7ab8bc6d4 ssl: buffered handshake detection 2020-12-28 14:25:37 +01:00
moneromooo-monero bc97eb8a33
portable_storage: remove overly aggressive cutoff 2020-12-27 12:44:38 +00:00
Alexander Blair 7438617bbf
Merge pull request #7192
95575cda6 epee: fix some issues using connections after shutdown (moneromooo-monero)
2020-12-26 13:44:10 -08:00
Alexander Blair bc9fce0d32
Merge pull request #7190
7f407c027 portable_storage: add some sanity checks on data size (moneromooo-monero)
2020-12-26 13:43:48 -08:00
Alexander Blair f191e0a00d
Merge pull request #7099
9d2bb586a Add command to sign freebsd assert file for gitian (MoneroArbo)
2020-12-26 13:38:31 -08:00
Alexander Blair b9e444da5e
Merge pull request #7098
c0c75ac19 Fixed issues found by static analysis (SChernykh)
2020-12-26 13:36:01 -08:00
moneromooo-monero 95575cda6e
epee: fix some issues using connections after shutdown 2020-12-26 14:14:55 +00:00
moneromooo-monero 7f407c0274
portable_storage: add some sanity checks on data size
especially when allocated size is >> serialized data size
2020-12-26 03:22:59 +00:00
Lee Clagett 187b4d7521 Restrict duplicate keys in epee binary format 2020-12-20 03:47:32 +00:00
Lee Clagett 61b6e4cc67 Add aggressive restrictions to pre-handshake p2p buffer limit 2020-12-17 00:36:10 +00:00
Lee Clagett 4978f69d7a Fix byte_stream::put_n 2020-12-14 14:45:24 -05:00
moneromooo-monero 0660db3e7a
fuzz_tests: add a test for utf8canonical 2020-12-14 19:40:24 +00:00
codesoap f2ad539f5f readline_buffer: Avoid consecutive duplicates in the history 2020-12-13 14:47:07 +01:00
Alexander Blair 25b596ce21
Merge pull request #7100
5b30203fe depends: Update OpenSSL to 1.1.1i (Howard Chu)
2020-12-10 17:36:05 -08:00
Alexander Blair 1e9483a2d5
Merge pull request #7009
7414e2bac Change epee binary output from std::stringstream to byte_stream (Lee Clagett)
2020-12-10 17:34:50 -08:00
Alexander Blair 6bddd54f9d
Merge pull request #7003
08eb0949f Change to more efficient allocation strategy in byte_stream (Lee Clagett)
2020-12-10 17:33:50 -08:00
Alexander Blair 49f7e961c0
Merge pull request #6947
19d1b3590 add a convenience script to start monero with inbound tor (moneromooo-monero)
2020-12-10 17:31:20 -08:00
Howard Chu 5b30203fe9
depends: Update OpenSSL to 1.1.1i
Remove some obsolete patches (they were integrated upstream).
Tweak to work with Android support (they second-guess our CC definition, etc).
2020-12-09 19:21:56 +00:00
MoneroArbo 9d2bb586ad
Add command to sign freebsd assert file for gitian
Add FreeBSD to "Signing assert files" section of gitian readme / guide
2020-12-08 16:46:09 -05:00
SChernykh c0c75ac19d Fixed issues found by static analysis
- rolling_median: tried to free uninitialized pointer in a constructor
- net_node.inl: erase-remove idiom was used incorrectly. remove_if doesn't actually remove elements, see http://cpp.sh/6fcjv
- bulletproofs.cc: call to sizeof() instead of vector.size(), luckily it only impacts performance and not code logic there
2020-12-08 18:43:44 +01:00
moneromooo ff7fdf6db2
protocol: drop peers that don't reply to queries 2020-12-06 15:57:40 +00:00
moneromooo 89e984d93b
keep only the last seen node on a given host in the white list 2020-12-04 01:55:22 +00:00
luigi1111 cda966078d
Merge pull request #6999
c5f6629 epee: tighten the URL parsing regexp a little (moneromooo-monero)
2020-11-29 01:56:44 -06:00
luigi1111 a15d781707
Merge pull request #6995
60bc676 epee: readline_buffer - fix thread safety, fix sync() after stop() (xiphon)
2020-11-29 01:55:15 -06:00
moneromooo-monero c5f6629f4a
epee: tighten the URL parsing regexp a little
fixes massive amounts of time spent on pathological inputs

Found by OSS-Fuzz
2020-11-09 13:05:39 +00:00
xiphon 60bc676c14 epee: readline_buffer - fix thread safety, fix sync() after stop() 2020-11-07 14:15:29 +00:00
moneromooo-monero 19d1b35905
add a convenience script to start monero with inbound tor 2020-10-28 22:38:27 +00:00
Howard Chu 2014a8410a
Force CMAKE_SKIP_RPATH=ON
Fix empty RPATH token issue. Only affects Linux and FreeBSD.
2020-10-19 08:58:38 +01:00
Alexander Blair 9bbf66504e
Merge pull request #6862
5f228e4b7 Fix lgamma/signgam dependency (Howard Chu)
2020-10-18 23:24:06 -07:00
Lee Clagett 08eb0949f3 Change to more efficient allocation strategy in byte_stream 2020-10-13 15:10:54 +00:00
Lee Clagett 249eae5f4a Allow byte_stream->byte_slice conversion to shrink unused buffer space 2020-10-13 15:09:18 +00:00
Lee Clagett 7414e2bac1 Change epee binary output from std::stringstream to byte_stream 2020-10-10 15:28:40 +00:00
Howard Chu 5f228e4b7d
Fix lgamma/signgam dependency
This is a new indirect dependency due to the use of poisson_distribution,
introduced in PR#6354 commit 67ade8005
2020-10-06 19:25:49 +01:00
TheCharlatan 2e3caa2011
Depends: Bump qt to 5.15.1 2020-09-17 09:00:26 +02:00
selsta f240b1dd88
build: prepare v0.17 2020-09-14 16:52:42 +02:00
Alexander Blair 44cd8a13ec
Merge pull request #6769
b641e0a2c Add clear method to byte_stream (Lee Clagett)
2020-08-27 12:05:16 -07:00
selsta 7c7ccbd2a5
depends: fix broken links for ds_store / mac_alias 2020-08-20 21:33:23 +02:00
Lee Clagett b641e0a2c0 Add clear method to byte_stream 2020-08-17 21:30:34 -04:00
Alexander Blair 43a4fd9e16
Merge pull request #6736
05ad4fa39 epee: further defending against exceptions in command handlers (moneromooo-monero)
2020-08-16 12:56:35 -07:00
Alexander Blair d73b1b6560
Merge pull request #6727
13eee1d6a rpc: reject wrong sized txid (moneromooo-monero)
92e6b7df2 easylogging++: fix crash with reentrant logging (moneromooo-monero)
6dd95d530 epee: guard against exceptions in RPC handlers (moneromooo-monero)
90016ad74 blockchain: guard against exceptions in add_new_block/children (moneromooo-monero)
2020-08-16 12:55:25 -07:00
Alexander Blair 7db379cc82
Merge pull request #6720
86abf558c epee: Remove unused functions in local_ip.h (Jean Pierre Dudey)
2020-08-16 12:54:17 -07:00
Alexander Blair 10ad0d7eb2
Merge pull request #6718
85efc88c1 Fix overflow issue in epee:misc_utils::rolling_median_t and median(), with unit test (koe)
2020-08-16 12:53:50 -07:00
Alexander Blair 01b512f3a9
Merge pull request #6716
76c16822d wallet2_api: implement runtime proxy configuration (xiphon)
2020-08-16 12:52:21 -07:00
Alexander Blair 79e93a8af8
Merge pull request #6691
6111689cf cmake: allow custom openssl path on macOS (selsta)
2020-08-16 12:48:07 -07:00
Alexander Blair c6c4ead44e
Merge pull request #6614
fb31167b1 Wallet, daemon: From 'help_advanced' back to 'help', and new 'apropos' command (rbrunner7)
2020-08-16 12:44:03 -07:00