6db0c006b2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-08 13:49:34 -04:00
b979415e8b
manpage fix to stop saying CacheIPv4DNS is on by default
...
Stop saying in the manual that clients cache ipv4 dns answers from exit
relays. We haven't used them since 0.2.6.3-alpha, and in ticket 24050
we stopped even caching them as of 0.3.2.6-alpha, but we forgot to say
so in the man page.
Fixes bug 26052; bugfix on 0.3.2.6-alpha.
2018-05-08 13:13:45 -04:00
0e4f7b56a2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-07 13:33:19 -04:00
46002aa691
Merge remote-tracking branch 'mikeperry/bug25733_029' into maint-0.3.3
2018-05-07 13:33:12 -04:00
40456054ea
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-03 13:38:54 -04:00
4c6a407b9d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-03 13:38:54 -04:00
be5b4415c2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-03 13:38:54 -04:00
6361a250f0
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-03 13:38:54 -04:00
44626b37f6
Merge remote-tracking branch 'catalyst-github/bug25936-033' into maint-0.3.3
2018-05-03 13:38:51 -04:00
726f238b72
Merge remote-tracking branch 'catalyst-github/bug25936-031' into maint-0.3.1
2018-05-03 13:38:46 -04:00
5227754b2f
Merge remote-tracking branch 'catalyst-github/bug25936-029' into maint-0.2.9
2018-05-03 13:38:37 -04:00
f6890422aa
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-03 13:37:37 -04:00
1bbe75da6d
Merge remote-tracking branch 'teor/bug25998' into maint-0.3.3
2018-05-03 13:37:33 -04:00
246765342e
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-02 08:46:28 -04:00
993e314c6f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-02 08:46:28 -04:00
8e81d329ee
Merge branch 'maint-0.3.3' into release-0.3.3
2018-05-02 08:46:28 -04:00
c66b512671
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-02 08:46:28 -04:00
d465bd27ed
Stop logging stack contents when reading a zero-length bandwidth file
...
When directory authorities read a zero-byte bandwidth file, they log
a warning with the contents of an uninitialised buffer. Log a warning
about the empty file instead.
Fixes bug 26007; bugfix on 0.2.2.1-alpha.
2018-05-02 22:36:23 +10:00
d96ddf8f1b
man page: FetchUselessDescriptors and DirCache exclude extra infos
2018-05-02 11:29:48 +10:00
4a7590c241
man page: UseMicrodescriptors auto and 1 are the same now
2018-05-02 10:46:10 +10:00
9b1d5e8826
man page: FetchUselessDescriptors stops tor going idle
...
Also explain how FetchUselessDescriptors and UseMicrodescriptors are
different.
Closes 25998.
2018-05-02 10:46:00 +10:00
3a53b0c9a2
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-27 13:26:17 -04:00
b116710e31
Stop initialising rust submodules, travis does this for us
...
Fixes #24630 .
2018-04-27 13:26:12 -04:00
35e7902116
Bug 25733: Avoid assert failure if all circuits time out.
...
Prior to #23100 , we were not counting HS circuit build times in our
calculation of the timeout. This could lead to a condition where our timeout
was set too low, based on non HS circuit build times, and then we would
abandon all HS circuits, storing no valid timeouts in the histogram.
This commit avoids the assert.
2018-04-26 21:28:28 +00:00
f0dc6c8e2a
Merge branch 'bug25936-032' into bug25936-033
2018-04-26 16:07:56 -05:00
2edc9cd484
Merge branch 'bug25936-031' into bug25936-032
2018-04-26 15:58:39 -05:00
5982105098
Merge branch 'bug25936-029' into bug25936-031
2018-04-26 15:46:57 -05:00
31865b5029
Show test-suite.log for distcheck on Travis CI
...
When Travis CI runs make distcheck, test-suite.log doesn't exist in
the expected place. Add a new make target to show this file and use
it when DISTCHECK=yes in .travis.yml. Fixes bug 25814; bug not in any
released Tor.
2018-04-26 15:35:47 -05:00
19bed6f936
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-25 08:01:54 -04:00
58f54a3588
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-25 08:01:54 -04:00
7c3f87eb4b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-25 08:01:53 -04:00
bb35405d2a
Fix a copy-paste error in the fix for #23693 .
...
Found by coverity; CID 25912; bug not in any released Tor.
2018-04-25 08:00:55 -04:00
148540c505
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-24 10:38:37 -04:00
85cd8386fa
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 10:38:37 -04:00
89a3fafd49
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 10:38:37 -04:00
5cc3a0379e
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-24 10:38:37 -04:00
d44753b0e8
Merge branch 'travis_distcheck_033' into maint-0.3.3
2018-04-24 10:38:34 -04:00
34e7dca9c9
Merge branch 'travis_distcheck_029' into maint-0.2.9
2018-04-24 10:38:19 -04:00
d8114a1f57
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-24 10:37:36 -04:00
7e7b052b2a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 10:37:36 -04:00
9187cdb1cd
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
2018-04-24 10:36:17 -04:00
08fca9414d
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-24 08:51:58 -04:00
6182f60f75
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 08:51:55 -04:00
d2951b381b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 08:49:24 -04:00
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
b259008c56
hs: Fix memleak in v3 on SIGHUP
...
Fixes #25901
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-04-23 11:09:57 -04:00
5807656f8f
Merge branch 'maint-0.3.3' into release-0.3.3
2018-04-23 09:24:33 -04:00
e8683bcbb1
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-23 09:24:33 -04:00
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Roger Dingledine
Nick Mathewson
teor
Mike Perry
Taylor Yu
David Goulet