Nick Mathewson
1f7f930f9e
Increment version to 0.3.2.9
2018-01-08 11:39:24 -05:00
Nick Mathewson
b85fa0bd5f
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-08 11:10:36 -05:00
Nick Mathewson
e3ab27001f
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-08 11:10:36 -05:00
Nick Mathewson
5ff2d8d770
Merge branch 'maint-0.3.2' into release-0.3.2
2018-01-08 11:10:36 -05:00
Nick Mathewson
1c5c5f0e50
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-08 11:10:36 -05:00
Nick Mathewson
9464da210d
Add changes file for new fallback directory list.
2018-01-08 11:09:08 -05:00
Nick Mathewson
a42e52dded
Add 7 other fallback dirs from teor's tests
...
These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"
2018-01-08 11:03:44 -05:00
Nick Mathewson
491c09c19a
Update the fallback_dirs.inc file: part 1
...
This takes the updated fallback_dirs_2018_01_06_CA.inc from
pastly's scan.
2018-01-08 10:57:06 -05:00
Nick Mathewson
efba81e3bb
Merge branch 'maint-0.3.2' into release-0.3.2
2018-01-08 09:35:55 -05:00
Nick Mathewson
748ad2124d
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-08 09:35:55 -05:00
Nick Mathewson
a1ce1ab201
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-08 09:34:57 -05:00
Nick Mathewson
8042c356f4
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-08 09:34:56 -05:00
Nick Mathewson
26e28829da
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-01-08 09:34:56 -05:00
Karsten Loesing
8efbeb0982
Update geoip and geoip6 to the January 5 2018 database.
2018-01-08 11:36:38 +01:00
Roger Dingledine
0d172c1182
Merge branch 'maint-0.3.2' into release-0.3.2
2018-01-05 18:26:14 -05:00
Roger Dingledine
5f2c7a8567
remove redundant "implement this" from log message
2018-01-05 18:23:07 -05:00
Nick Mathewson
8edc0be74b
Merge branch 'maint-0.3.2' into release-0.3.2
2018-01-05 16:41:35 -05:00
Nick Mathewson
48d94e290d
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-05 16:41:34 -05:00
Nick Mathewson
16fd975a82
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-05 16:41:34 -05:00
Nick Mathewson
3618bd6166
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-05 16:41:34 -05:00
Nick Mathewson
c52d4d9e34
Merge branch 'teor_ticket24681_028' into maint-0.2.9
2018-01-05 16:41:31 -05:00
Nick Mathewson
94d5523c7f
fix a wide line
2018-01-05 11:28:23 -05:00
Nick Mathewson
2ac9734bd2
Use -lresolv in LIBS with rust on OSX.
...
This fixes issue #24652 , and is a workaround for Rust issue
https://github.com/rust-lang/rust/issues/46797 .
2018-01-04 14:02:24 -05:00
Nick Mathewson
c7c043d2b6
Merge branch 'maint-0.3.2' into release-0.3.2
2018-01-03 10:08:48 -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
1a070767de
Merge branch 'maint-0.3.2' into release-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
99b4f86833
Merge branch 'maint-0.3.2' into release-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
fd46d8d0ad
Merge branch 'maint-0.3.2' into release-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
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
30e1371675
Make the default DirAuthorityFallbackRate 0.1
...
This makes clients on the public tor network prefer to bootstrap off fallback
directory mirrors.
This is a follow-up to 24679, which removed weights from the default fallbacks.
Implements ticket 24681.
2017-12-23 00:01:31 +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
11336cfa09
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 14:23:06 -05:00
Nick Mathewson
94c59851df
Increment version to 0.3.2.8-rc-dev
2017-12-21 14:22:54 -05:00
Nick Mathewson
63b84335dc
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 12:42:22 -05:00
Nick Mathewson
1a77799665
Increment version to 0.3.2.8-rc
2017-12-21 12:42:00 -05:00
Nick Mathewson
afacaa02a5
reflow the changelog
2017-12-21 12:40:32 -05:00
Nick Mathewson
9be4b91760
start an 0.3.2.8 changelog
2017-12-21 12:40:11 -05:00
Nick Mathewson
0d1a2e366a
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 11:16:00 -05:00
