Nick Mathewson
677048fe9f
Merge branch 'maint-0.3.4'
2018-08-23 20:44:16 -04:00
Nick Mathewson
d0007db1f0
Merge remote-tracking branch 'teor/bug26979-034' into maint-0.3.4
2018-08-23 20:44:06 -04:00
teor
78049afaa5
Appveyor CI: always use HEAD for the short commit
...
Part of 26979.
2018-08-24 10:11:24 +10:00
teor
8425091718
Appveyor CI: Changes file for 26979
...
Closes 26979.
2018-08-24 10:11:20 +10:00
teor
3ecb7125b4
Appveyor CI: sort environmental variables
...
To avoid future duplicates.
2018-08-24 10:11:17 +10:00
teor
32fb4403e3
Appveyor CI: fix some typos
2018-08-24 10:11:13 +10:00
teor
965a910abf
Appveyor CI: Generate correct tag names
...
Part of 26979.
2018-08-24 10:11:10 +10:00
teor
4157015700
Appveyor CI: Switch to one URL per line
...
Part of 26979.
2018-08-24 10:11:07 +10:00
teor
6a870c69bb
Appveyor CI: Generate correct branches and URLs for pull requests
...
Part of 26979.
2018-08-24 10:11:03 +10:00
teor
d8ce84aae4
Appveyor CI: Make short commits 10 hexdigits long
...
That's what git does for tor.
Part of 26979.
2018-08-24 10:11:00 +10:00
teor
73d46b76fd
Appveyor CI: Fix GitHub provider detection
...
Part of 26979.
2018-08-24 10:10:55 +10:00
Nick Mathewson
9323f5d1d4
Merge branch 'maint-0.3.4'
2018-08-23 20:07:47 -04:00
Nick Mathewson
90f6c590af
Merge remote-tracking branch 'teor/ticket27275-034' into maint-0.3.4
2018-08-23 20:07:39 -04:00
teor
08ad1f1e46
CI: Only post Appveyor IRC notifications when the build fails
...
Implements 27275.
2018-08-24 10:06:06 +10:00
Nick Mathewson
d50f90bfc4
Merge branch 'maint-0.3.4'
2018-08-23 19:37:32 -04:00
Nick Mathewson
6e0872e867
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-23 19:36:45 -04:00
Nick Mathewson
e01ea64f0a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-23 19:36:45 -04:00
Nick Mathewson
36bb11a650
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-23 19:36:45 -04:00
teor
cc4ea34a26
Silence a compilation warning on MSVC 2017 and clang-cl
...
test.c no longer uses lround(), so we don't need to declare it,
and we can use math.h for fabs().
Fixes bug 27185; bugfix on 0.2.2.2-alpha.
2018-08-24 09:15:04 +10:00
Nick Mathewson
2ae92ab973
Merge branch 'maint-0.3.4'
2018-08-23 14:26:04 -04:00
Nick Mathewson
ced350882d
Merge remote-tracking branch 'teor/bug27236-034' into maint-0.3.4
2018-08-23 14:22:30 -04:00
teor
fadcab920b
Bootstrap: check the exit policy and flag on descriptors
...
Previously, Tor would only check the exit flag. In small networks, Tor
could bootstrap once it received a consensus with exits, without fetching
the new descriptors for those exits.
After bootstrap, Tor delays descriptor fetches, leading to failures in
fast networks like chutney.
Fixes 27236; bugfix on 0.2.6.3-alpha.
2018-08-24 01:13:53 +10:00
teor
692efdad09
Update the message logged on relays when DirCache is disabled
...
Since 0.3.3.5-rc, authorities require DirCache (V2Dir) for the Guard
flag.
Fixes bug 24312; bugfix on 0.3.3.5-rc.
2018-08-23 19:13:25 +10:00
Dominique Ingoglia
8747afc5e0
Change the wording of the DirCache warning
2018-08-23 19:13:15 +10:00
Nick Mathewson
8691046ac6
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-22 09:37:31 -04:00
Nick Mathewson
c1ad40627b
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-22 09:37:31 -04:00
Nick Mathewson
573b6e4f2f
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-22 09:37:31 -04:00
Nick Mathewson
ac44e70ffc
Merge branch 'maint-0.3.4'
2018-08-22 09:37:31 -04:00
Nick Mathewson
9068e2fa28
Mark cert_matches_key as not-intrusive; fix stretch compilation.
2018-08-22 09:37:26 -04:00
Nick Mathewson
e619fd02ef
Merge remote-tracking branch 'tor-github/pr/287'
2018-08-21 20:08:55 -04:00
Nick Mathewson
3cfceeb45d
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-21 20:04:17 -04:00
Nick Mathewson
81e529d236
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 20:04:17 -04:00
Nick Mathewson
05cd3224a0
Merge branch 'maint-0.3.4'
2018-08-21 20:04:17 -04:00
Nick Mathewson
bf5704051c
Merge remote-tracking branch 'teor/travis-osx-master'
2018-08-21 20:04:13 -04:00
Nick Mathewson
aac1e17f22
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
2018-08-21 20:04:03 -04:00
Nick Mathewson
f0633bc491
Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3
2018-08-21 20:03:56 -04:00
Nick Mathewson
a5bbe3f1d0
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-21 20:03:46 -04:00
Nick Mathewson
a29e9a901d
Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2
2018-08-21 20:03:41 -04:00
Nick Mathewson
05d62a3b73
Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9
2018-08-21 20:03:19 -04:00
Neel Chauhan
3bf4493cb9
Remove duplicate include in src/test/test_address.c
2018-08-21 20:01:48 -04:00
Nick Mathewson
de66bd397c
Merge branch 'maint-0.3.4'
2018-08-21 19:20:37 -04:00
Nick Mathewson
f68aab83ba
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 19:20:31 -04:00
Nick Mathewson
245025a3df
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-21 19:16:40 -04:00
Nick Mathewson
d52f406001
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-21 19:16:40 -04:00
Nick Mathewson
9bb0ac4bf1
Merge branch 'coverage_6aug_squashed'
2018-08-21 12:14:51 -04:00
Nick Mathewson
fe00a481fc
Add a unit test for tor_log_mallinfo()
2018-08-21 12:14:41 -04:00
Nick Mathewson
f124037cde
Add unit tests for parsing "extended" format of config lines.
2018-08-21 12:14:41 -04:00
Nick Mathewson
df874ed0f1
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-21 10:01:41 -04:00
Nick Mathewson
9bc947dc18
Merge branch 'maint-0.3.4'
2018-08-21 10:01:41 -04:00
Nick Mathewson
4c0c4d4ade
Add changes file for 26873. I missed this when merging earlier.
2018-08-21 10:01:38 -04:00