[tor-commits] [snowflake/master] Log to io.Discard if no log file is set.

commit 6077141f4affdab9b7ce97a9b1c6859825eaaa29 Author: David Fifield Date: Sun Jun 10 16:41:32 2018 -0700 Log to io.Discard if no log file is set. https://bugs.torproject.org/25600#comment:14 Snowflake in Tor Browser has been hanging after surfing for a while. (Tor

[tor-commits] [translation/https_everywhere] Removing da_DK

commit 0974512eae0a87991aaa674e19aac9431cf2c92c Author: Translation commit bot Date: Tue Jun 12 18:55:49 2018 + Removing da_DK --- da_DK/https-everywhere.dtd| 53 da_DK/https-everywhere.properties | 8 --- da_DK/ssl-observatory.dtd | 101

[tor-commits] [webwml/master] Move Linda to the past contributor section

commit 4f62c9183e68dde350671d167f0f6ed4652006c4 Author: Damian Johnson Date: Tue Jun 12 10:23:56 2018 -0700 Move Linda to the past contributor section --- about/en/contributors.wml | 3 ++ about/en/corepeople.wml | 87 +-- 2 files changed, 41

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

commit f88cdd89eafcb3430894ae9e9b37c402413982ba Author: Translation commit bot Date: Tue Jun 12 17:17:18 2018 + Update translations for torbutton-torbuttondtd --- ka/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

commit 5e142795b2445404b395702ce9003f13da7fab28 Author: Translation commit bot Date: Tue Jun 12 17:17:09 2018 + Update translations for torbutton-torbuttonproperties --- ka/torbutton.properties | 50 - 1 file changed, 25 insertions(+),

[tor-commits] [translation/tails-misc] Update translations for tails-misc

commit e05a0274cc0311396044294826ba8aaaed829dd7 Author: Translation commit bot Date: Tue Jun 12 17:16:38 2018 + Update translations for tails-misc --- ka.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ka.po b/ka.po index 03356845e..f4b18b524 100644 ---

[tor-commits] [tor/master] copy 0.3.3.7 changelog forward to master

commit 1b04dab60c549d9f0d621e1a115cab8a49c839f9 Author: Nick Mathewson Date: Tue Jun 12 12:06:26 2018 -0400 copy 0.3.3.7 changelog forward to master --- ChangeLog| 41 + ReleaseNotes | 41 + 2 files

[tor-commits] [tor/maint-0.3.3] bump to 0.3.3.7-dev

commit 5f39bed9412b7b27b903fc1939b7774fb1b0 Author: Nick Mathewson Date: Tue Jun 12 12:05:09 2018 -0400 bump to 0.3.3.7-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

commit 147c67d81dd52c4b09546b69992c0633f4007649 Merge: ccf2d6561 5f39b Author: Nick Mathewson Date: Tue Jun 12 12:05:18 2018 -0400 Merge branch 'maint-0.3.3' "ours" to avoid version bump. ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

commit bc5d904237d3431163ae463488efbc063292e408 Merge: 035a35178 5f39b Author: Nick Mathewson Date: Tue Jun 12 12:05:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/master] bump to 0.3.4.2-alpha-dev

commit ccf2d65610a86dafdbee5af79ce9ffa4db54ce17 Author: Nick Mathewson Date: Tue Jun 12 12:04:58 2018 -0400 bump to 0.3.4.2-alpha-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/release-0.3.3] bump to 0.3.3.7-dev

commit 5f39bed9412b7b27b903fc1939b7774fb1b0 Author: Nick Mathewson Date: Tue Jun 12 12:05:09 2018 -0400 bump to 0.3.3.7-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/master] bump to 0.3.3.7-dev

commit 5f39bed9412b7b27b903fc1939b7774fb1b0 Author: Nick Mathewson Date: Tue Jun 12 12:05:09 2018 -0400 bump to 0.3.3.7-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [webwml/master] new source releases: 0.3.3.7 and 0.3.4.2-alpha

commit 78d21fc65b035c49479d01a9c0977886b1df482c Author: Nick Mathewson Date: Tue Jun 12 11:53:08 2018 -0400 new source releases: 0.3.3.7 and 0.3.4.2-alpha --- include/versions.wmi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/versions.wmi

[tor-commits] [tor/release-0.3.3] Fold in changelog entry.

commit 035a35178c92da94400c13767a265053ff6c8413 Author: Nick Mathewson Date: Tue Jun 12 09:47:25 2018 -0400 Fold in changelog entry. --- ChangeLog | 4 ReleaseNotes| 4 changes/ticket26343 | 3 --- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/master] Fold in changelog entry.

commit bc951e83aac770d123118bf485d14490c2539048 Author: Nick Mathewson Date: Tue Jun 12 09:47:07 2018 -0400 Fold in changelog entry. --- ChangeLog | 4 changes/ticket26343 | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

commit 75732ef4cd45fa822d80b7f95330c5447a2b3e9a Merge: bded08415 ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 53513e4bfed4c6713509f239cad94ca5b4995246 Merge: 5d8a927aa 16381b579 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.1] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/release-0.3.2] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 53513e4bfed4c6713509f239cad94ca5b4995246 Merge: 5d8a927aa 16381b579 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

commit ce959b9424aef1fa04b0d4c21faa59f92e42b43d Merge: ef0b19aec eaa359650 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit eaa359650cd4654744f8750ee6a59d8653e96147 Merge: f2e7570c7 53513e4bf Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

commit 03461d5d401d9d9ddfaabd6f09648d4338460449 Merge: b86c2c178 16381b579 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

commit c62ab5417e02082eb1cced26913495ae60597a5b Merge: a5c1b17e1 53513e4bf Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/release-0.3.2] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/release-0.3.2] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

commit eaa359650cd4654744f8750ee6a59d8653e96147 Merge: f2e7570c7 53513e4bf Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.3] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.3] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/maint-0.3.3] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.1] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.1] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.2] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 53513e4bfed4c6713509f239cad94ca5b4995246 Merge: 5d8a927aa 16381b579 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.2.9] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

commit 03f3ee6d74d548b1f8ed10c475f450977c518b34 Merge: b13fe14cb eaa359650 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.3' changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.2.9] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 53513e4bfed4c6713509f239cad94ca5b4995246 Merge: 5d8a927aa 16381b579 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit eaa359650cd4654744f8750ee6a59d8653e96147 Merge: f2e7570c7 53513e4bf Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/master] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/master] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 53513e4bfed4c6713509f239cad94ca5b4995246 Merge: 5d8a927aa 16381b579 Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/master] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/release-0.2.9] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/maint-0.3.2] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.3.1] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/maint-0.2.9] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/maint-0.3.2] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9 Merge: d84581a3e ef671147f Author: Nick Mathewson Date: Tue Jun 12 09:44:17 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.2.9] Add IPv6 orport address for dannenberg.

commit 6cf9288518edcba33e18d966c549d91d3eb4578a Author: Linus Nordberg Date: Sun Jun 10 11:07:00 2018 +0200 Add IPv6 orport address for dannenberg. --- src/or/auth_dirs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc index

[tor-commits] [tor/maint-0.3.1] Add a changelog entry.

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a Author: Linus Nordberg Date: Sun Jun 10 13:09:38 2018 +0200 Add a changelog entry. --- changes/ticket26343 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket26343 b/changes/ticket26343 new file mode 100644 index

[tor-commits] [tor/maint-0.3.1] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/maint-0.2.9] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

commit ef671147f21814ed505505ec96bfcf297bc6bb7a Merge: ae540569c 2ef448da2 Author: Nick Mathewson Date: Tue Jun 12 09:44:13 2018 -0400 Merge branch 'dannenberg_ipv6_029' into maint-0.2.9 changes/ticket26343 | 3 +++ src/or/auth_dirs.inc | 1 + 2 files changed, 4 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

commit ef0b19aec68bf48018f4c833778bc9b966ab9a25 Merge: 7b7b817c3 f2e7570c7 Author: Nick Mathewson Date: Tue Jun 12 08:57:37 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/master] Remove folded-in changes files

commit 73aae608d5e46251599dea9272862aa2560640d7 Author: Nick Mathewson Date: Tue Jun 12 08:56:28 2018 -0400 Remove folded-in changes files --- changes/bug26272 | 3 --- changes/bug26283 | 4 changes/geoip-2018-06-07 | 4 3 files changed, 11 deletions(-) diff

[tor-commits] [tor/release-0.3.3] changelog for 0.3.3.7

commit 7b7b817c3ef68d7272ceec2ea0bdbd04684ae5dd Author: Nick Mathewson Date: Tue Jun 12 08:56:05 2018 -0400 changelog for 0.3.3.7 --- ChangeLog| 37 + ReleaseNotes | 37 +

[tor-commits] [tor/master] Bump to 0.3.3.7

commit f2e7570c75ec8d0f0415530461a4c5b3695fc671 Author: Nick Mathewson Date: Tue Jun 12 08:57:09 2018 -0400 Bump to 0.3.3.7 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/maint-0.3.3] Bump to 0.3.3.7

commit f2e7570c75ec8d0f0415530461a4c5b3695fc671 Author: Nick Mathewson Date: Tue Jun 12 08:57:09 2018 -0400 Bump to 0.3.3.7 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

commit b13fe14cb0fca9f747ca4f83fbde3e5cc3fa0576 Merge: 73aae608d f2e7570c7 Author: Nick Mathewson Date: Tue Jun 12 08:57:25 2018 -0400 Merge branch 'maint-0.3.3' "ours" merge to avoid version bump. ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.3] Bump to 0.3.3.7

commit f2e7570c75ec8d0f0415530461a4c5b3695fc671 Author: Nick Mathewson Date: Tue Jun 12 08:57:09 2018 -0400 Bump to 0.3.3.7 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 3

[tor-commits] [tor/master] Lightly edit changelog

commit 4540ddd3e3d9807601c0f9c971cf84cabdc10d5f Author: Nick Mathewson Date: Tue Jun 12 08:46:35 2018 -0400 Lightly edit changelog Remove the "documentation" section, since a comment-only change doesn't usually get a changelog entry. --- ChangeLog | 19 ++- 1

[tor-commits] [tor/master] format changelog.

commit e9ecb09786763a65838b9760e5d14dd3b4956b25 Author: Nick Mathewson Date: Tue Jun 12 08:36:48 2018 -0400 format changelog. --- ChangeLog | 80 ++- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/ChangeLog

[tor-commits] [tor/master] add more entries to changelog

commit 33919d8e1d8f24c3b66aad00d73dd551f69fc4e6 Author: Nick Mathewson Date: Tue Jun 12 08:36:28 2018 -0400 add more entries to changelog --- ChangeLog | 14 ++ 1 file changed, 14 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4bdc524c8..93a58647f 100644 ---

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 5d8a927aa35c01c59dcf137827db27b92d034498 Merge: 74ac463e7 d84581a3e Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

commit d84581a3e677a6905125b619c590488c12a36ae8 Merge: 19f386852 8366be3b5 Author: Nick Mathewson Date: Tue Jun 12 08:18:53 2018 -0400 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed,

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 7fff99110b6d00dbd438ce9182474f045f996f3f Merge: 6dca180ae 5d8a927aa Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/release-0.3.3] Silence unused-const-variable warnings in zstd.h on some gcc versions

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8 Author: teor Date: Sat Jun 2 14:08:01 2018 -0700 Silence unused-const-variable warnings in zstd.h on some gcc versions Fixes bug 26272; bugfix on 0.3.1.1-alpha. --- changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

commit a5c1b17e14402254ed162ca849914cb0103e49de Merge: e1e914cd4 5d8a927aa Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

commit 9ff769c4921f77bff0e0b7b76c53d4e5b1af7659 Merge: 3cca9a103 7fff99110 Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 5d8a927aa35c01c59dcf137827db27b92d034498 Merge: 74ac463e7 d84581a3e Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/release-0.3.1] Silence unused-const-variable warnings in zstd.h on some gcc versions

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8 Author: teor Date: Sat Jun 2 14:08:01 2018 -0700 Silence unused-const-variable warnings in zstd.h on some gcc versions Fixes bug 26272; bugfix on 0.3.1.1-alpha. --- changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

commit 6230dfaf14bb6b92a5afaa8e81d00da4f0805955 Merge: f4e51990b 7fff99110 Author: Nick Mathewson Date: Tue Jun 12 08:18:57 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+) diff --cc

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 5d8a927aa35c01c59dcf137827db27b92d034498 Merge: 74ac463e7 d84581a3e Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/release-0.3.2] Silence unused-const-variable warnings in zstd.h on some gcc versions

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8 Author: teor Date: Sat Jun 2 14:08:01 2018 -0700 Silence unused-const-variable warnings in zstd.h on some gcc versions Fixes bug 26272; bugfix on 0.3.1.1-alpha. --- changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

commit b86c2c178d0545b7afeccfd2ac88ba8ea555d233 Merge: 086459091 d84581a3e Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

commit d84581a3e677a6905125b619c590488c12a36ae8 Merge: 19f386852 8366be3b5 Author: Nick Mathewson Date: Tue Jun 12 08:18:53 2018 -0400 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed,

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

commit d84581a3e677a6905125b619c590488c12a36ae8 Merge: 19f386852 8366be3b5 Author: Nick Mathewson Date: Tue Jun 12 08:18:53 2018 -0400 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed,

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 5d8a927aa35c01c59dcf137827db27b92d034498 Merge: 74ac463e7 d84581a3e Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 7fff99110b6d00dbd438ce9182474f045f996f3f Merge: 6dca180ae 5d8a927aa Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/master] Silence unused-const-variable warnings in zstd.h on some gcc versions

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8 Author: teor Date: Sat Jun 2 14:08:01 2018 -0700 Silence unused-const-variable warnings in zstd.h on some gcc versions Fixes bug 26272; bugfix on 0.3.1.1-alpha. --- changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2

[tor-commits] [tor/maint-0.3.3] Silence unused-const-variable warnings in zstd.h on some gcc versions

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8 Author: teor Date: Sat Jun 2 14:08:01 2018 -0700 Silence unused-const-variable warnings in zstd.h on some gcc versions Fixes bug 26272; bugfix on 0.3.1.1-alpha. --- changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

commit d84581a3e677a6905125b619c590488c12a36ae8 Merge: 19f386852 8366be3b5 Author: Nick Mathewson Date: Tue Jun 12 08:18:53 2018 -0400 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed,

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

commit d84581a3e677a6905125b619c590488c12a36ae8 Merge: 19f386852 8366be3b5 Author: Nick Mathewson Date: Tue Jun 12 08:18:53 2018 -0400 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed,

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

commit d84581a3e677a6905125b619c590488c12a36ae8 Merge: 19f386852 8366be3b5 Author: Nick Mathewson Date: Tue Jun 12 08:18:53 2018 -0400 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed,

[tor-commits] [tor/maint-0.3.1] Silence unused-const-variable warnings in zstd.h on some gcc versions

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8 Author: teor Date: Sat Jun 2 14:08:01 2018 -0700 Silence unused-const-variable warnings in zstd.h on some gcc versions Fixes bug 26272; bugfix on 0.3.1.1-alpha. --- changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2

[tor-commits] [tor/maint-0.3.2] Silence unused-const-variable warnings in zstd.h on some gcc versions

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8 Author: teor Date: Sat Jun 2 14:08:01 2018 -0700 Silence unused-const-variable warnings in zstd.h on some gcc versions Fixes bug 26272; bugfix on 0.3.1.1-alpha. --- changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

commit d84581a3e677a6905125b619c590488c12a36ae8 Merge: 19f386852 8366be3b5 Author: Nick Mathewson Date: Tue Jun 12 08:18:53 2018 -0400 Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed,

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

commit 7fff99110b6d00dbd438ce9182474f045f996f3f Merge: 6dca180ae 5d8a927aa Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

commit 5d8a927aa35c01c59dcf137827db27b92d034498 Merge: 74ac463e7 d84581a3e Author: Nick Mathewson Date: Tue Jun 12 08:18:56 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26272 | 3 +++ src/common/compress_zstd.c | 2 ++ 2 files changed, 5 insertions(+)

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug26283'

commit f4e51990b911161b26138f40f3d370eeafd9ac2f Merge: b2470f514 9876575d2 Author: Nick Mathewson Date: Tue Jun 12 08:17:48 2018 -0400 Merge remote-tracking branch 'rl1987/bug26283' changes/bug26283| 4 src/or/routerlist.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

  1   2   >