torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,097 Commits 53 Branches 631 Tags
0fa1d8ef92a2911fcf660bc57637d525988d63b6
Commit Graph

9164 Commits

Author SHA1 Message Date
teor 0fa1d8ef92 Merge branch 'pr1777_squashed' 2020-03-17 21:08:45 +10:00
rl1987 b0cb3f5458 Documentation fixups 2020-03-17 21:07:47 +10:00
Nick Mathewson 49eec76c5e Merge branch 'maint-0.4.3' 2020-03-16 12:21:57 -04:00
Nick Mathewson 855cd533e1 Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3 2020-03-16 12:21:49 -04:00
Nick Mathewson 452398913a Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test 2020-03-16 10:40:55 -04:00
Neel Chauhan 460b97380b Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version() 2020-03-16 10:40:14 -04:00
teor 93d12baf89 Merge branch 'maint-0.4.2' into maint-0.4.3 2020-03-16 20:54:34 +10:00
teor 9ef8f5d1b8 Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-16 20:54:27 +10:00
teor c22696e360 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-03-16 20:54:20 +10:00
teor 1c688ba925 Travis: Produce detailed chutney diagnostics 
When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
to produce detailed diagnostic output.

Closes ticket 32792.
 2020-03-16 16:04:51 +10:00
Nick Mathewson b2e543bfe7 Merge branch 'maint-0.3.5' into maint-0.4.1 2020-03-13 16:46:16 -04:00
Nick Mathewson 6ed2c9e5fa Merge branch 'maint-0.4.1' into maint-0.4.2 2020-03-13 16:46:16 -04:00
Nick Mathewson b9d71f3848 Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5 2020-03-13 16:46:09 -04:00
Nick Mathewson b504942331 Merge remote-tracking branch 'tor-github/pr/1718/head' into maint-0.4.2 2020-03-13 16:42:47 -04:00
teor dbadfe75e6 Merge remote-tracking branch 'tor-github/pr/1735' into maint-0.4.3 2020-03-13 13:00:58 +10:00
teor 1d17541cfa Merge branch 'pr1764_squashed' 2020-03-13 11:14:20 +10:00
Nick Mathewson 78c9ff7052 Add a script to install the scripts in scripts/git appropriately. 
To run this, say something like

   TOR_DEVTOOL_DIR=~/bin scripts/git/git-install-tools.sh all

To see what it would do, give it the -n flag.

To get help, give it the -h flag.
 2020-03-13 11:14:04 +10:00
Nick Mathewson 9ca7900e17 Merge branch 'maint-0.4.3' 2020-03-12 12:46:12 -04:00
Nick Mathewson e03bb35f90 Merge branch 'ticket33361_035_01_squashed' into maint-0.4.3 
Conflicts:
        src/app/config/config.c
 2020-03-12 12:45:56 -04:00
David Goulet b755a489bd config: Warn if ContactInfo is not set 
Closes #33361

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-03-12 12:43:00 -04:00
David Goulet df3f2bd9aa hs-v3: Log reasons why service can't upload descriptor 
When a service can not upload its descriptor(s), we have no logs on why. This
adds logging for each possible reason for each descriptors.

That logging is emitted every second so it is rate limited for each reason and
per descriptor.

Closes #33400

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2020-03-11 15:32:11 +02:00
David Goulet 05aab3fd21 Merge branch 'maint-0.4.3' 2020-03-10 09:14:44 -04:00
rl1987 94a2376e01 Document __OwningControllerProcess torrc option and mention polling interval 2020-03-10 09:13:19 -04:00
David Goulet 2d53168511 Merge branch 'tor-github/pr/1723' 2020-03-09 10:36:05 -04:00
David Goulet 6684c6e17f Merge branch 'tor-github/pr/1751' 2020-03-09 09:33:05 -04:00
Neel Chauhan 7d673e70b0 Remove the ClientAutoIPv6ORPort option 2020-03-09 09:33:00 -04:00
rl1987 159009ae47 Add changes file 2020-03-06 19:25:54 +02:00
rl1987 ef991b04e2 Refrain from mentioning nicknames in manpage section for MyFamily. 
Also, fix a typo.
 2020-03-05 17:41:49 +02:00
Nick Mathewson ba8d71d9c3 Merge remote-tracking branch 'tor-github/pr/1774/head' 2020-03-05 09:10:24 -05:00
Nick Mathewson 7177eeddf1 Merge branch 'maint-0.4.3' 2020-03-05 08:48:40 -05:00
Roger Dingledine 29542ccdcc Remove surprising empty line in info-level cbt log 
Fixes bug 33531; bugfix on 0.3.3.1-alpha.
 2020-03-04 13:45:34 -05:00
George Kadianakis edc0bf5089 Merge branch 'tor-github/pr/1763' 2020-03-03 14:35:31 +02:00
Nick Mathewson c705c8cf1b changes file for 33436 2020-03-03 14:35:01 +02:00
Nick Mathewson 87e0873056 changes file for ticket 33460. 2020-02-26 14:19:53 -05:00
Nick Mathewson 11adf0f46f Merge remote-tracking branch 'tor-github/pr/1750/head' 2020-02-25 12:58:23 -05:00
Nick Mathewson b6d9484fa7 Merge remote-tracking branch 'tor-github/pr/1761/head' 2020-02-24 08:06:42 -05:00
Nick Mathewson d4d5d9d1d1 Merge branch 'ticket33316_squashed' 2020-02-24 07:49:45 -05:00
Nick Mathewson 0c18c94bb1 extend ticket33316 changes file to include more changes 2020-02-24 07:49:39 -05:00
Nick Mathewson 67d921a696 Changes file for ticket 33316 2020-02-24 07:49:39 -05:00
Nick Mathewson caa392a73a Merge remote-tracking branch 'tor-github/pr/1685/head' 2020-02-24 07:45:20 -05:00
George Kadianakis 93cb8072be Final touches to #32709 based on Nick's feedback. 
- Fix a bug and add unittest.
- Add changes file.
- Add man page entry.
 2020-02-24 12:15:35 +02:00
Taylor Yu 7160a7218d changes file for ticket 33369 2020-02-20 17:13:02 -06:00
Nick Mathewson 7ba7f9c0de Merge branch 'maint-0.4.3' 2020-02-20 10:44:43 -05:00
Nick Mathewson 7b42502869 Merge remote-tracking branch 'tor-github/pr/1757/head' into maint-0.4.3 2020-02-20 10:44:36 -05:00
Nick Mathewson 626eb025b6 Merge remote-tracking branch 'tor-github/pr/1745/head' 2020-02-20 09:14:40 -05:00
Nick Mathewson 09fb7987c5 Merge branch 'maint-0.4.3' 2020-02-20 08:50:18 -05:00
Nick Mathewson f733b8acd6 Merge remote-tracking branch 'tor-github/pr/1719/head' into maint-0.4.3 2020-02-20 08:48:17 -05:00
Nick Mathewson b9cc4cc50a Merge branch 'ticket4631_squashed' 2020-02-20 08:17:47 -05:00
Nick Mathewson a65efa7e83 Merge branch 'extract_relay_dns' 2020-02-19 13:58:53 -05:00
Nick Mathewson 65b75ef3d5 Merge branch 'extract_ext_orport' 2020-02-19 13:55:18 -05:00