Nick Mathewson
e0ccec219b
Merge remote-tracking branch 'frewsxcv/frewsxcv-protover-heap'
2018-01-04 11:05:53 -05:00
Nick Mathewson
943134e886
Merge remote-tracking branch 'pastly2/ticket24531_033_01'
2018-01-03 11:56:35 -05:00
Nick Mathewson
b56ce79e63
In networkstatus_consensus_has_ipv6 test, use approx_time()
...
This may (or may not) fix up some reliability issues we've been
seeing with this test on windows.
2018-01-03 10:57:44 -05:00
Nick Mathewson
6b3c07648c
Merge branch 'maint-0.3.2'
2018-01-03 10:09:20 -05:00
Nick Mathewson
9ef97a268b
Merge branch 'bug24634' into maint-0.3.2
2018-01-03 10:08:36 -05:00
Nick Mathewson
1bc95633fb
Fix some shadowed-global warnings.
...
These are all about local variables shadowing global
functions. That isn't normally a problem, but at least one
compiler we care about seems to treat this as a case of -Wshadow
violation, so let's fix it.
Fixes bug 24634; bugfix on 0.3.2.1-alpha.
2018-01-03 09:13:00 -05:00
Nick Mathewson
b62b40a572
Merge branch 'maint-0.3.2'
2018-01-03 09:00:00 -05:00
Nick Mathewson
451c852a0f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-03 09:00:00 -05:00
Nick Mathewson
c1d98c75e3
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-03 08:59:59 -05:00
Nick Mathewson
bbc9ff160e
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-03 08:59:59 -05:00
Nick Mathewson
c9b3f6352f
Merge branch 'bug24633_029' into maint-0.2.9
2018-01-03 08:59:52 -05:00
Nick Mathewson
bd9739bae6
Merge branch 'maint-0.3.2'
2018-01-02 14:42:31 -05:00
Nick Mathewson
2aa1767b25
Merge remote-tracking branch 'teor/bug24703_032' into maint-0.3.2
2018-01-02 14:42:27 -05:00
Nick Mathewson
fb5877b972
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-02 10:10:28 -05:00
Nick Mathewson
8a7767603a
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-02 10:10:28 -05:00
Nick Mathewson
bc5ef83f8f
Merge branch 'maint-0.3.2'
2018-01-02 10:10:28 -05:00
Nick Mathewson
707076002d
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-02 10:10:28 -05:00
Nick Mathewson
6e5e4f92ab
Merge remote-tracking branch 'teor/bug24736_028' into maint-0.2.9
2018-01-02 10:09:44 -05:00
Nick Mathewson
d53f779853
Merge remote-tracking branch 'teor/ticket24001'
2018-01-02 10:07:13 -05:00
Nick Mathewson
996328f374
Remove changes file for 24762
...
(Bugfixes for bugs not in any released Tor don't get listed in the
changelog, and therefore don't need changes files.)
2018-01-02 09:55:32 -05:00
Nick Mathewson
2819e9467e
Merge remote-tracking branch 'teor/bug24762'
2018-01-02 09:54:56 -05:00
Nick Mathewson
5051cfe9bd
Merge remote-tracking branch 'ffmancera/github/bug24677'
2018-01-02 09:37:23 -05:00
Fernando Fernandez Mancera
3871c102a6
Use ping -6 ::1 on Linux when ping6 ::1 fails on tests.
...
Tor test now checks if "ping -6 -c 1 -W 1 ::1" works when "ping6 -c 1 -W 1 ::1"
fails on tests.
Fixes #24677 ; bugfix in 0.2.9.3-alpha.
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2018-01-02 15:18:36 +01:00
teor
d99ccf090f
Stop trying to remove NULL filenames on shutdown
...
Fixes bug 24762; bugfix on master.
(Not in any released version of Tor.)
2017-12-30 17:19:42 +11:00
Corey Farwell
2529319f68
[fixup] this might be an improvement?
2017-12-28 18:17:45 -08:00
Corey Farwell
8ba5805bae
Remove unneeded heap allocations in protover.rs.
2017-12-27 22:05:06 -08:00
teor
09b9a35c07
Clear the address when we can't choose a reachable address
...
When the fascist_firewall_choose_address_ functions don't find a
reachable address, set the returned address to the null address and port.
This is a precautionary measure, because some callers do not check the
return value.
Fixes bug 24736; bugfix on 0.2.8.2-alpha.
2017-12-25 01:55:28 +11:00
teor
53f350182e
Expand comments in node_get_ed25519_id() and put them near the relevant code
...
And add a changes file.
Follow-up to 24001.
2017-12-24 19:50:47 +11:00
ArunaMaurya221B
5865e56ec0
Conditional check added
2017-12-24 19:43:57 +11:00
teor
a8e8ce8602
Bump the dates and Tor versions on the sample torrcs
2017-12-22 11:22:48 +11:00
teor
d10c2d6668
Clarify the OutboundBindAddressOR documentation in the sample torrc
...
Part of 22145
2017-12-22 11:22:10 +11:00
teor
5fb26ba2d8
Document IPv6Exit in the sample torrcs
...
Sample config-only change.
Implements 24703.
2017-12-22 11:10:30 +11:00
Nick Mathewson
f5d89fab25
Merge branch 'maint-0.3.2'
...
"ours" to avoid version bump.
2017-12-21 14:22:58 -05:00
Nick Mathewson
94c59851df
Increment version to 0.3.2.8-rc-dev
2017-12-21 14:22:54 -05:00
Nick Mathewson
20e9b428c2
forward-port the 0.3.2.8-rc changelog
2017-12-21 14:22:30 -05:00
Nick Mathewson
713a717022
scan-build: Replace some test-assertions with fatal assertions
...
Using tt_assert in these helpers was implying to scan-build that our
'new' functions might be returning NULL, which in turn would make it
warn about null-pointer use.
2017-12-21 13:26:57 -05:00
Nick Mathewson
eb00840ab8
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2017-12-21 12:42:11 -05:00
Nick Mathewson
1a77799665
Increment version to 0.3.2.8-rc
2017-12-21 12:42:00 -05:00
Nick Mathewson
7b9e790956
remove changes files that appear in 0.3.2.8-rc
2017-12-21 12:41:25 -05:00
Nick Mathewson
2b8a06a2ef
Merge branch 'maint-0.3.2'
2017-12-21 11:16:00 -05:00
Nick Mathewson
6cd567d797
Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2
2017-12-21 11:13:33 -05:00
Nick Mathewson
2f0d57db56
Fix a compilation error in the channel tests.
...
This would only show up on systems like windows where monotime_t and
monotime_coarse_t are different types.
2017-12-21 11:10:30 -05:00
Nick Mathewson
1eeb505e6f
In 0.3.3, we use timestamps, not absolute milliseconds.
2017-12-21 10:57:45 -05:00
Nick Mathewson
b8a3602b2a
Merge branch 'maint-0.3.2'
2017-12-21 10:54:05 -05:00
Nick Mathewson
84adb9fcca
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-21 10:50:33 -05:00
Nick Mathewson
08469a338a
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-21 10:50:06 -05:00
Nick Mathewson
03b4dd92a4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-21 10:49:40 -05:00
Nick Mathewson
79a50afa0e
Use monotime_coarse_absolute_msec() in destroy queue
...
This way it will match the insert queue in 029 and later.
2017-12-21 10:48:37 -05:00
Nick Mathewson
3b08184338
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-21 10:43:12 -05:00
Nick Mathewson
7d845976e3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-21 10:43:06 -05:00
