Nick Mathewson
4efbb5d2c1
Merge branch 'maint-0.4.0'
2019-04-03 09:27:44 -04:00
Nick Mathewson
de76862fd6
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-03 09:27:44 -04:00
Nick Mathewson
4aa02d3c7a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-03 09:27:43 -04:00
Nick Mathewson
3cfcfbac46
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-03 09:27:42 -04:00
Nick Mathewson
ee6f54ff3f
Merge remote-tracking branch 'tor-github/pr/860'
2019-04-03 08:33:40 -04:00
Karsten Loesing
54e249e269
Update geoip and geoip6 to the April 2 2019 database.
2019-04-03 09:26:28 +02:00
teor
583ed7c6ec
Merge remote-tracking branch 'tor-github/pr/864'
2019-04-02 11:46:42 +10:00
teor
9014add25f
Merge branch 'maint-0.4.0'
2019-04-02 11:45:39 +10:00
teor
9242f32883
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-02 11:45:31 +10:00
teor
0418d4081a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-02 11:45:22 +10:00
teor
74775b2dfd
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-02 11:45:13 +10:00
Nick Mathewson
9ed02ec282
Merge branch 'ticket29662_squashed' into ticket29662_squashed_merged
2019-03-29 14:28:48 -04:00
rl1987
bf953fe602
Add changes file
2019-03-29 14:26:03 -04:00
Nick Mathewson
a7bc47532b
test_routerkeys.c: Always check mkdir() return value
...
After this fix, we have no more unchecked mkdir() calls.
Bug 29939; CID 144254. Bugfix on 0.2.7.2-alpha.
2019-03-28 09:31:13 -04:00
George Kadianakis
00ca3d04cf
Merge branch 'tor-github/pr/859'
2019-03-27 14:30:53 +02:00
teor
8991280f89
Merge branch 'maint-0.4.0'
2019-03-27 12:31:37 +10:00
teor
6d188fb4cc
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
2019-03-27 12:31:07 +10:00
teor
a10d4adc25
Stop assuming that /usr/bin/python3 exists
...
For scripts that work with python2, use /usr/bin/python.
Otherwise, use /usr/bin/env python3.
Fixes bug 29913; bugfix on 0.2.5.3-alpha.
2019-03-27 11:07:55 +10:00
Nick Mathewson
a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
Nick Mathewson
3767eff9bb
changes file for pubsub code
2019-03-26 20:10:56 -04:00
teor
6d057c56f1
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
2019-03-27 10:01:45 +10:00
teor
c72526f168
Merge branch 'maint-0.4.0'
2019-03-27 09:36:55 +10:00
teor
9ae8d663ea
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
2019-03-27 09:36:26 +10:00
George Kadianakis
989b6325d6
Merge branch 'tor-github/pr/842'
2019-03-26 16:41:07 +02:00
Nick Mathewson
f32d890531
Merge branch 'bug29805_rebased_squashed'
2019-03-26 09:39:46 -04:00
George Kadianakis
08176c2396
prob-distr: Silence some coverity warnings.
2019-03-26 09:39:37 -04:00
George Kadianakis
d11976b8bd
Merge branch 'tor-github/pr/709'
2019-03-26 15:34:54 +02:00
George Kadianakis
2790ee3685
Merge branch 'maint-0.4.0'
2019-03-26 15:16:37 +02:00
George Kadianakis
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
teor
613c5ff357
Merge remote-tracking branch 'tor-github/pr/724'
2019-03-26 19:31:17 +10:00
teor
0642650865
Merge branch 'maint-0.4.0'
2019-03-26 19:16:06 +10:00
teor
4258728d56
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
2019-03-26 19:15:46 +10:00
juga0
6ecf9590ea
changes: add file for #21377
2019-03-26 17:41:21 +10:00
teor
3d38d0ca24
Merge branch 'maint-0.4.0'
2019-03-26 16:57:04 +10:00
teor
828033001b
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
2019-03-26 16:56:45 +10:00
teor
d482913e69
Merge remote-tracking branch 'tor-github/pr/834'
2019-03-26 12:55:48 +10:00
rl1987
669ec64325
Fix CID 1444119
...
Let's use the same function exit point for BUG() codepath that we're using
for every other exit condition. That way, we're not forgetting to clean up
the memarea.
2019-03-26 12:24:45 +10:00
teor
b76ae3898d
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
2019-03-26 11:48:52 +10:00
Nick Mathewson
b71febcea8
changes file for control.c splitup
2019-03-25 15:08:36 -04:00
Taylor Yu
5d2f5e482e
Correctly report PT vs proxy during bootstrap
...
Previously, or_connection_t did not record whether or not the
connection uses a pluggable transport. Instead, it stored the
underlying proxy protocol of the pluggable transport in
proxy_type. This made bootstrap reporting treat pluggable transport
connections as plain proxy connections.
Store a separate bit indicating whether a pluggable transport is in
use, and decode this during bootstrap reporting.
Fixes bug 28925; bugfix on 0.4.0.1-alpha.
2019-03-25 14:13:45 +10:00
teor
d4d541c53c
Merge remote-tracking branch 'tor-github/pr/785'
2019-03-25 14:01:20 +10:00
Alexander Færøy
4be522b2e6
Pass NULL to lpApplicationName in CreateProcessA().
...
When NULL is given to lpApplicationName we enable Windows' "magical"
path interpretation logic, which makes Tor 0.4.x behave in the same way
as previous Tor versions did when it comes to executing binaries in
different system paths.
For more information about this have a look at the CreateProcessA()
documentation on MSDN -- especially the string interpretation example is
useful to understand this issue.
This bug was introduced in commit bfb94dd2cahttps://bugs.torproject.org/29874
2019-03-25 03:10:37 +01:00
rl1987
f09205ef53
Refactor test_utils_general() to fix Coverity warnings
2019-03-24 10:10:52 +02:00
rl1987
9529d99982
Tweak changes file
2019-03-24 09:25:30 +02:00
Nick Mathewson
22e72eeaa7
Merge branch 'maint-0.4.0'
2019-03-22 11:17:10 -04:00
George Kadianakis
a5df9402b6
prob-distr: Decrease false positive rate of stochastic tests.
2019-03-22 11:16:30 -04:00
teor
f7688cb179
test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9
...
We need a recent test-network.sh to use new chutney features in CI.
Fixes bug 29703; bugfix on 0.2.9.1-alpha.
2019-03-22 13:20:23 +10:00
teor
15900ab70f
Merge remote-tracking branch 'tor-github/pr/819'
2019-03-22 13:10:47 +10:00
George Kadianakis
846d379b50
circpad/prob_distr: Use crypto_fast_rng() instead of the old RNG.
2019-03-22 09:22:54 +10:00
teor
3adb689fbc
Merge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_merged
...
Copy and paste the vote=0 code from the old src/or/dirserv.c
to the new src/feature/dirauth/bwauth.c.
2019-03-21 12:04:30 +10:00
