Nick Mathewson
87dee5c651
Socks->SOCKS in torrcs. Fixes 15609
2015-09-29 10:20:31 +02:00
Nick Mathewson
8e93cfb47f
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-09-29 10:18:09 +02:00
teor (Tim Wilson-Brown)
7fa102b487
Add checks and unit tests for get_interface_address* failure
...
Ensure that either a valid address is returned in address pointers,
or that the address data is zeroed on error.
Ensure that free_interface_address6_list handles NULL lists.
Add unit tests for get_interface_address* failure cases.
Fixes bug #17173 .
Patch by fk/teor, not in any released version of tor.
2015-09-29 10:17:05 +02:00
Fabian Keil
3ea834ce0a
get_interface_address6_list(): Bring back a return code check
...
... that was removed by 31eb486c46Fixes #17173 .
2015-09-29 10:17:00 +02:00
Nick Mathewson
3d8a045bd6
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-09-29 10:12:05 +02:00
Nick Mathewson
216a9f7aec
Changes file for bug17154
2015-09-29 10:10:52 +02:00
Marcin Cieślak
f75325c132
No spaces around = in variable assignment
...
BSD make takes spaces around = literally
and produces a "TESTING_TOR_BINARY "
variable with a trailing space, which leads
to test_keygen.sh failure.
Fixes 17154
2015-09-29 10:09:02 +02:00
Nick Mathewson
546d70dc7c
Add changes file for bug17151
2015-09-29 10:08:02 +02:00
Marcin Cieślak
00e15ba477
FreeBSD needs -lexecinfo to get backtrace()
2015-09-29 10:04:30 +02:00
Marcin Cieślak
5c95762ec6
Skip tests if backtrace support not compiled-in
...
FreeBSD needs -lexecinfo to fully support
backtrace reporting.
2015-09-29 10:04:14 +02:00
Nick Mathewson
551dba3290
Bump master to 0.2.8.0-alpha-dev
2015-09-25 09:27:39 -04:00
Nick Mathewson
4ce9b8f1ec
Bump to 0.2.7.3-rc-dev
2015-09-25 09:26:35 -04:00
Nick Mathewson
9a4cac74fd
A day has passed.
2015-09-25 09:06:41 -04:00
Nick Mathewson
7b1d2726e4
Add test-network.sh to EXTRA_DIST
2015-09-24 19:38:50 -04:00
Nick Mathewson
8d6bb3a559
Make our digest-mismatch warnings a touch better
2015-09-24 17:45:33 -04:00
Nick Mathewson
9febbf0451
Merge branch 'bug17149'
2015-09-24 17:19:21 -04:00
Nick Mathewson
4b2ae5a16b
Include some content when exporting abs_top_srcdir and builddir
...
FreeBSD make demands this.
2015-09-24 17:06:49 -04:00
Nick Mathewson
e62fe2f02d
Put braces around reject-lines for IPv6 addrs
...
Fixes bug 17149; bug not in any released Tor.
2015-09-24 16:51:25 -04:00
Nick Mathewson
2a902ae525
fold 17148 into changelog
2015-09-24 15:31:50 -04:00
Nick Mathewson
85b65bf29f
Add more quotes in the test scripts
2015-09-24 15:25:53 -04:00
Nick Mathewson
eb2188168e
Stop trying to generate test scripts via autoconf substitution.
...
Use environment variables instead. This repairs 'make distcheck',
which was running into trouble when it tried to chmod the generated
scripts.
Fixes 17148.
2015-09-24 15:07:39 -04:00
Nick Mathewson
3f52a33739
fix tor-fw-helper url
2015-09-24 14:12:45 -04:00
Nick Mathewson
f55cdee0db
Changelog: more clarity and fixing
2015-09-24 14:08:30 -04:00
Nick Mathewson
744f8c8277
Increment version.
2015-09-24 12:19:33 -04:00
Nick Mathewson
8b0707405e
Now I have a number here. (Had to use OSX becaue of #17146 )
2015-09-24 12:15:20 -04:00
Nick Mathewson
458ccd38dd
fold 17135 into changelog
2015-09-24 11:56:00 -04:00
Nick Mathewson
a395d1aa46
Merge branch 'underpinning_squashed'
2015-09-24 11:29:14 -04:00
Nick Mathewson
51d18aeb42
changes file and manpage entry for AuthDirPinKeys
2015-09-24 11:29:05 -04:00
Nick Mathewson
2d139f77d7
Fold new entries into changelog
2015-09-24 11:00:30 -04:00
Nick Mathewson
4ee4fe56ee
Reformat the changelog
2015-09-24 10:57:22 -04:00
Nick Mathewson
8cf756da63
more edits to the changelog
2015-09-24 10:57:07 -04:00
Nick Mathewson
09e272eb1e
Merge remote-tracking branch 'origin/maint-0.2.6'
2015-09-24 10:06:36 -04:00
Nick Mathewson
fb5a858a35
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-09-24 10:06:15 -04:00
Nick Mathewson
809217e6f3
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-09-24 10:06:00 -04:00
Karsten Loesing
8b3e0b7729
Update geoip and geoip6 to the September 3 2015 database.
2015-09-24 15:08:15 +02:00
Nick Mathewson
4302dec9d5
various changelog entry rewrites/revisions
2015-09-23 19:48:41 -04:00
Nick Mathewson
01733e2b15
New AuthDirPinKeys option to enable/disable keypinning enforcement
...
Implements ticket #17135 . We're going to need this one to avoid
chaos as everybody figures out how ed25519 keys work.
2015-09-23 11:22:26 -04:00
Nick Mathewson
efea1e904a
Extract the add-or-replace-keypin logic into a new function
...
We're about to need to call it in another place too.
2015-09-23 11:07:17 -04:00
Nick Mathewson
c5e87e33c7
Allow conflicts to occur in keypinning journal
...
When we find a conflict in the keypinning journal, treat the new
entry as superseding all old entries that overlap either of its
keys.
Also add a (not-yet-used) configuration option to disable keypinning
enforcement.
2015-09-23 11:02:21 -04:00
Nick Mathewson
81724d5a00
some changelog work
2015-09-23 10:44:22 -04:00
Nick Mathewson
53fc782e49
add a README to src/config
2015-09-22 17:06:39 -04:00
Nick Mathewson
216024261b
add more clang checkers; find no new bugs.
2015-09-22 11:37:50 -04:00
Nick Mathewson
742514be2f
scan-build is more mature now; no need to hardcode the one in my /opt/clang-3.4
2015-09-22 09:58:16 -04:00
Nick Mathewson
6b6a714732
Fix a memory leak in router_parse_addr_policy_item_from_string. CID 1324770
2015-09-22 09:55:05 -04:00
Nick Mathewson
df0b4f0342
Merge branch 'feature16769_squashed'
2015-09-22 09:26:30 -04:00
Nick Mathewson
8234fa0053
Remove --master-key form the changes file
2015-09-22 09:24:35 -04:00
Nick Mathewson
1911f80fb5
Disable --master-key as not-yet-working for 0.2.7
2015-09-22 09:24:35 -04:00
Nick Mathewson
bca4211de5
Add a --master-key option
...
This lets the user override the default location for the master key
when used with --keygen
Part of 16769.
2015-09-22 09:24:35 -04:00
Nick Mathewson
d8f031aec2
Add a new --newpass option to add or remove secret key passphrases.
2015-09-22 09:24:35 -04:00
Nick Mathewson
e94ef30a2f
Merge branch 'feature16944_v2'
2015-09-22 09:19:28 -04:00
