Nick Mathewson
5d219ecf98
Update Longclaw's IP address; fixes 23592.
2017-10-17 14:00:30 -04:00
Nick Mathewson
b9b5f9a1a5
Merge branch 'maint-0.3.2'
2017-10-17 13:58:25 -04:00
Nick Mathewson
9298749088
Add dirauth changes as a lintchanges category
2017-10-17 13:58:21 -04:00
Nick Mathewson
d8604b8729
Merge branch 'teor_bug23813_squashed'
2017-10-15 20:36:23 -04:00
teor
eaf9c0f25a
Describe what router_reset_descriptor_download_failures() actually does
...
Comment-only change.
Part of #23813 .
2017-10-15 20:36:18 -04:00
teor
5bca66be49
Clear the address when node_get_prim_orport() returns early
...
Fixes bug 23874; bugfix on 0.2.8.2-alpha.
2017-10-15 16:48:36 -04:00
Nick Mathewson
e00f12ec6c
bump version on master to 0.3.3.0-alpha-dev
2017-10-15 11:57:06 -04:00
Nick Mathewson
22139c0b28
Merge remote-tracking branch 'catalyst-oniongit/bug23757'
2017-10-10 14:09:49 -04:00
Nick Mathewson
d9321d697d
Merge remote-tracking branch 'catalyst-oniongit/bug23755'
2017-10-10 14:07:34 -04:00
Taylor Yu
3ae5b32aaa
Match .travis.yml more closely
...
Adjust the GitLab CI configuration to more closely match that of
Travis CI. Fixes bug 23757.
2017-10-05 22:42:00 -05:00
Taylor Yu
d5d811e2d0
Only run "update" job from scheduled pipelines
...
Stop attempting to unconditionally mirror the tor repository in GitLab
CI. This prevented developers from enabling GitLab CI on master
because the "update" job would attempt to run, causing an unuseful CI
failure. Fixes bug 23755.
2017-10-05 13:37:57 -05:00
Nick Mathewson
91c17ffbd6
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:04:59 -04:00
Nick Mathewson
f7f55acae9
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:04:59 -04:00
Nick Mathewson
7a4741c233
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:04:59 -04:00
Nick Mathewson
43ebe54a24
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:04:59 -04:00
Nick Mathewson
51e47481fc
Merge branch 'maint-0.3.1'
2017-10-05 11:04:59 -04:00
Nick Mathewson
2e21493a88
add missing subcategory in changes file
2017-10-05 11:04:54 -04:00
Nick Mathewson
bdf60fc7ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-10-05 11:03:36 -04:00
Nick Mathewson
0cd7c1af37
Merge branch 'maint-0.3.1'
2017-10-05 11:03:36 -04:00
Nick Mathewson
d6bdec1595
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:03:35 -04:00
Nick Mathewson
ad7db10770
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-10-05 11:03:35 -04:00
Nick Mathewson
2984d99165
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-10-05 11:03:35 -04:00
Karsten Loesing
b9d9b16b76
Update geoip and geoip6 to the October 4 2017 database.
2017-10-05 16:56:14 +02:00
Taylor Yu
44e4a96bb5
Don't expect permission failure if running as root
...
Skip test_config_include_no_permission() when running as root, because
it will get an unexpected success from config_get_lines_include().
This affects some continuous integration setups. Fixes bug 23758.
2017-10-04 08:42:05 -05:00
Nick Mathewson
55e5446f8d
note cathugger in changes file for 23748
2017-10-04 09:01:59 -04:00
cathugger
9d90f9829c
hs-v3: Always generate the public key file on disk
...
Fixes #23748
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03 11:19:10 -04:00
Nick Mathewson
1e7e36da4b
Merge branch 'bug23672_032_01_squashed'
2017-10-03 10:56:52 -04:00
David Goulet
6691af1855
hs: Add changes file for 23653
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03 10:56:46 -04:00
David Goulet
30d2e0b71e
test: Add an HS v3 descriptor fetch unit test
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03 10:56:46 -04:00
David Goulet
c232b6b59c
hs-v3: Close pending SOCKS connection on descriptor fetch error
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-10-03 10:56:46 -04:00
Nick Mathewson
783a44b2cd
Merge remote-tracking branch 'asn/bug23670'
2017-10-03 09:05:16 -04:00
Nick Mathewson
bc6769e0d4
Merge remote-tracking branch 'catalyst-oniongit/bug23739'
2017-10-03 09:04:21 -04:00
George Kadianakis
f7306b16ec
entrynodes: Better naming for dir info check functions.
2017-10-03 15:55:19 +03:00
George Kadianakis
d891faddc7
entrynodes: Add changes file.
2017-10-03 15:48:12 +03:00
Taylor Yu
6a2a49e661
Improve docs on using gcov
...
Add more explanation in doc/HACKING about how to read gcov output,
including a reference to the gcov documentation in the GCC manual.
Also add details about how our postprocessing scripts modify gcov
output.
2017-10-03 07:45:36 -05:00
Nick Mathewson
a6c62cbd13
Merge branch 'bug23678_032'
2017-10-03 08:18:08 -04:00
Nick Mathewson
f923aeee1b
Follow-up on 23678: fix socks/wrong_protocol test
2017-10-03 08:17:41 -04:00
Nick Mathewson
f2e820c45f
torcert.c: mark some lines unreachable by tests
...
These are related to handling of failures on functions which can't
fail.
2017-10-03 08:07:36 -04:00
Nick Mathewson
bb7288b2c3
Make the fp_pair_map tests cover {get,set}_by_digests
2017-10-03 08:07:36 -04:00
Nick Mathewson
d00a26f860
Merge remote-tracking branch 'catalyst-oniongit/bug23741'
2017-10-03 08:05:46 -04:00
Nick Mathewson
7bc85d8204
Merge remote-tracking branch 'isis/bug23695'
2017-10-03 08:03:22 -04:00
George Kadianakis
5352785d0c
entrynodes: Error msg for missing guard descs is now more informative.
2017-10-03 14:41:20 +03:00
George Kadianakis
f2231306ba
entrynodes: Move guard dirinfo check below path dirinfo check.
...
We do that because we want to use the path fraction dirinfo data in case
we are missing primary guard dirinfo.
2017-10-03 14:41:18 +03:00
George Kadianakis
c9729853a5
entrynodes: Be specific about how many primary descriptors we miss.
2017-10-03 14:39:34 +03:00
Nick Mathewson
d0cae9fbc5
bump master to 0.3.2.2-alpha-dev
2017-10-02 19:19:51 -04:00
Taylor Yu
e31ffb2741
Don't move gcov output to root directory
...
In scripts/test/coverage, avoid attempting to move gcov output files
to the root directory when given no arguments. Fixes bug 23741.
2017-10-02 16:09:28 -05:00
Isis Lovecruft
e2a2704f17
Fix a couple typos in the ChangeLog entries for 0.3.2.2-alpha.
2017-10-02 19:38:49 +00:00
Alexander Færøy
c61508f9aa
Bump version to 0.3.2.2-alpha.
...
Signed-off-by: Isis Lovecruft <isis@torproject.org>
2017-10-02 19:23:32 +00:00
Isis Lovecruft
c816bbd229
Remove changes files integrated for 0.3.2.2-alpha.
2017-10-02 17:49:56 +00:00
Nick Mathewson
ad4dcd7d1a
Fix our "not an HTTP Proxy" message in light of HTTPTunnelPort
...
When we added HTTPTunnelPort, the answer that we give when you try
to use your SOCKSPort as an HTTP proxy became wrong. Now we explain
that Tor sorta _is_ an HTTP proxy, but a SOCKSPort isn't.
I have left the status line the same, in case anything is depending
on it. I have removed the extra padding for Internet Explorer,
since the message is well over 512 bytes without it.
Fixes bug 23678; bugfix on 0.3.2.1-alpha.
2017-10-02 12:53:13 -04:00
