[tor-commits] [tor-browser/tor-browser-52.2.0esr-7.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.

commit 96a0b3ce8bf4b13d6c6f8d799af028c600ad1cb1 Author: Georg Koppen Date: Thu Jul 13 08:48:59 2017 + fixup! TB4: Tor Browser's Firefox preference overrides. We disable the GetAddons item on the about:addons page as we don't know which extensions

[tor-commits] [torbutton/master] Translations update

commit e41a6ff5e768f95a6b0c5b5cf253ef1dfdb685c9 Author: Georg Koppen Date: Thu Aug 3 08:21:25 2017 + Translations update --- src/chrome/locale/ar/torbutton.dtd| 2 +- src/chrome/locale/de/torbutton.dtd| 2 +- src/chrome/locale/es/torbutton.dtd

[tor-commits] [tor-browser/tor-browser-52.2.0esr-7.0-1] Bug 21321: .onion domains are shown as non-secure

commit 30b633b92a94bced2537354afe3d228f0eace8da Author: Georg Koppen Date: Thu Aug 3 09:07:37 2017 + Bug 21321: .onion domains are shown as non-secure Websites which collect passwords but don't use HTTPS start showing scary warnings from Firefox 51

[tor-commits] [tor-browser/tor-browser-52.2.0esr-7.0-1] Bug 21321: Add test for .onion whitelisting

commit 7a03cca9991cfab93be16e9d5521bc58c35d4d44 Author: Georg Koppen Date: Mon Jul 24 10:23:00 2017 + Bug 21321: Add test for .onion whitelisting --- dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js | 9 + 1 file changed, 9 insertions(+) diff

[tor-commits] [tor-launcher/master] Translations update

commit 21d5b10f9620702feec5b8e642f5f20996b201a8 Author: Georg Koppen Date: Thu Aug 3 08:29:01 2017 + Translations update --- src/chrome/locale/cs/network-settings.dtd | 2 +- src/chrome/locale/cs/torlauncher.properties| 8

[tor-commits] [tor-launcher/master] Version bump

commit 447b6f74f68c06258840abd1bdf5c496528e128d Author: Georg Koppen Date: Thu Aug 3 08:29:15 2017 + Version bump --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 14b29ce..a045040

[tor-commits] [tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 21321: .onion domains are shown as non-secure

commit df2223e1b1f8a4b782e7e49bbbeb79296ea74dff Author: Georg Koppen Date: Thu Aug 3 09:07:37 2017 + Bug 21321: .onion domains are shown as non-secure Websites which collect passwords but don't use HTTPS start showing scary warnings from Firefox 51

[tor-commits] [tor-browser/tor-browser-52.2.0esr-7.5-1] Bug 21321: Add test for .onion whitelisting

commit 490f3cc2d708cf693ebb7c730b7bb2562dc8987c Author: Georg Koppen Date: Mon Jul 24 10:23:00 2017 + Bug 21321: Add test for .onion whitelisting --- dom/security/test/unit/test_isOriginPotentiallyTrustworthy.js | 9 + 1 file changed, 9 insertions(+) diff

[tor-commits] [gitian-builder/tor-browser-builder-4] Bug 22467: Don't break upgrade on Jessie VM

commit cbcaacd2152ca43ebc51874dcbb074de14dcc392 Author: Georg Koppen Date: Thu Aug 3 09:19:58 2017 + Bug 22467: Don't break upgrade on Jessie VM The problem seems to be related to `linux-image-` trying to upgrade itself during `dist-upgrade` while

[tor-commits] [tor-browser-bundle/maint-7.0] Release preparations for 7.0.4

commit cd573d8a0c7a45594d19f8461124d7d7fa5e50d1 Author: Georg Koppen Date: Thu Aug 3 09:45:14 2017 + Release preparations for 7.0.4 Changelog update, version bumps, and config.yml update --- Bundle-Data/Docs/ChangeLog.txt| 28

[tor-commits] [tor-browser-bundle/maint-7.0] Revert "Apply patch for bug 23044"

commit 0711c3e7293f8a4970fd19a7ab11736b8e39d673 Author: Georg Koppen Date: Wed Aug 2 09:53:24 2017 + Revert "Apply patch for bug 23044" This reverts commit a11a8b301950e1c25adcfd5bea07c773f5082533. We do the right thing and get the patch via the

[tor-commits] [tor-browser-bundle/maint-7.0] Bug 22884: about:tor page is not showing up

commit bfcf699785a7e7aa7cb49fe61400c4d4aee3836a Author: Kathy Brade Date: Wed Jul 19 10:05:48 2017 -0400 Bug 22884: about:tor page is not showing up Whitelist about:tor so that NoScript does not block its JavaScript. ---

[tor-commits] [tor/master] Changes suggested by teor.

commit a437080d379bb7a6c723edec163b16a7ca3d2cf9 Author: Nick Mathewson Date: Thu Aug 3 10:11:17 2017 -0400 Changes suggested by teor. --- doc/tor.1.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index

[tor-commits] [tor/master] Merge branch 'bug20152'

commit fabc3deb7570837f0969f8023c6927900263d313 Merge: 96cf608b2 a437080d3 Author: Nick Mathewson Date: Thu Aug 3 10:11:44 2017 -0400 Merge branch 'bug20152' changes/doc20152 | 3 +++ doc/tor.1.txt| 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-)

[tor-commits] [tor/master] Try to improve documentation for DirAuthority's port field.

commit 42e787817cc78aba714bed683f8a7a9efd7d4f30 Author: Nick Mathewson Date: Wed Jul 5 12:58:51 2017 -0400 Try to improve documentation for DirAuthority's port field. Closes ticket 20152 --- changes/doc20152 | 3 +++ doc/tor.1.txt| 8 +--- 2 files

[tor-commits] [tor-browser-build/master] meek: include *.1.txt instead of *.1 files on Windows

commit 9a392fd711a582e1c275c1c454deb766e07c5c6f Author: Nicolas Vigier Date: Thu Aug 3 16:32:26 2017 +0200 meek: include *.1.txt instead of *.1 files on Windows --- projects/meek/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor-browser-build/master] Bug 22499: build obfsproxy and fteproxy for Windows

commit 6221fac747287361a0e4432c3ebf6590461bbbcf Author: Nicolas Vigier Date: Thu Aug 3 17:56:39 2017 +0200 Bug 22499: build obfsproxy and fteproxy for Windows Also finish including the Linux build of obfsproxy and fteproxy. Based on

[tor-commits] [sandboxed-tor-browser/master] Bug 13170: Disable the rest of the Firefox experiments botnet prefs.

commit 3cb78c8c65ea220c01a9abbd484c8a0284beb5fd Author: Yawning Angel Date: Thu Aug 3 17:26:05 2017 + Bug 13170: Disable the rest of the Firefox experiments botnet prefs. The Tor Browser developers have not took action on this, so I will. ---

[tor-commits] [sandboxed-tor-browser/master] fixup! Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks.

commit 4cd7ad592166c8146c0f1493e69fea66cc057c19 Author: Yawning Angel Date: Thu Aug 3 17:32:37 2017 + fixup! Bug 22984: Force IDNs to be displayed as punycode to thwart homograph attacks. --- ChangeLog | 1 + data/installer/mozilla.cfg | 2 +-

[tor-commits] [torspec/master] prop271: Clarify when guards may be added to {CONFIRMED_GUARDS}.

commit db17344f15a9e02d041e9d51ff325133cc07007e Author: Isis Lovecruft Date: Thu Aug 3 18:20:22 2017 + prop271: Clarify when guards may be added to {CONFIRMED_GUARDS}. --- proposals/271-another-guard-selection.txt | 5 - 1 file changed, 4 insertions(+), 1

[tor-commits] [torspec/master] dir-spec: Specify linewrapping behaviour for base64-encoded data.

commit 8ebdf2e99f93628055c7d7a89327191cf4d161dc Author: Isis Lovecruft Date: Tue Aug 1 17:15:21 2017 + dir-spec: Specify linewrapping behaviour for base64-encoded data. * THANKS TO Mr. George Costanza for pointing out the ambiguity. --- dir-spec.txt | 8

[tor-commits] [torspec/master] prop271: Note Paul's concerns on guard sampling biases from Wilmington.

commit 28a8208232cac218b9bbbd95521ad7bd3c266b37 Author: Isis Lovecruft Date: Thu Aug 3 18:19:12 2017 + prop271: Note Paul's concerns on guard sampling biases from Wilmington. --- proposals/271-another-guard-selection.txt | 17 + 1 file changed, 17

[tor-commits] [tor-browser-build/master] Add comment to explain why we build https-e once for all platforms

commit 84fd513bee8b345d636a3f9d6529fe683c40f0a1 Author: Nicolas Vigier Date: Thu Aug 3 21:43:42 2017 +0200 Add comment to explain why we build https-e once for all platforms --- projects/https-everywhere/config | 8 1 file changed, 8 insertions(+) diff

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

commit d3aa197701711ead04b57c0d37892c4b11890d9c Author: Translation commit bot Date: Fri Aug 4 01:46:07 2017 + Update translations for tails-greeter --- ms_MY/ms_MY.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ms_MY/ms_MY.po

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

commit e3296e415e2d602af7396aa632d02447904b7a3c Author: Translation commit bot Date: Fri Aug 4 01:47:04 2017 + Update translations for tails-misc --- ms_MY.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms_MY.po b/ms_MY.po index

[tor-commits] [tor-browser-build/master] Add a README.HACKING file

commit 41dc4091f04a16754b208af8edbb2e501a0a3831 Author: Nicolas Vigier Date: Fri Aug 4 00:19:47 2017 +0200 Add a README.HACKING file Add a file to list the main things to know when making changes to the Tor Browser build. --- README | 7 ++

[tor-commits] [tor-browser-build/master] firefox: add var/torbrowser_update_channel value for the release channel

commit 47552843a3111c640c809524b34054246f9e4806 Author: Nicolas Vigier Date: Thu Aug 3 23:49:08 2017 +0200 firefox: add var/torbrowser_update_channel value for the release channel --- projects/firefox/config | 4 1 file changed, 4 insertions(+) diff --git

[tor-commits] [tor-browser-build/master] Add var/release, var/alpha, var/nightly options

commit bec3345342b0a60a5a8e908e50a37dbdd4e0697b Author: Nicolas Vigier Date: Thu Aug 3 23:44:17 2017 +0200 Add var/release, var/alpha, var/nightly options Add some options to be able to write things like this in templates: [% IF c("var/release") -%]

[tor-commits] [tor/master] routerkeys: Add cmdline option for learning signing key expiration.

commit b2a7e8df900eabe41d6e866f8b66aadd8a0d31d7 Author: Isis Lovecruft Date: Fri Jul 14 01:25:01 2017 + routerkeys: Add cmdline option for learning signing key expiration. * CLOSES #17639. * ADDS new --key-expiration commandline option which prints

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

commit 771662ee755338e7e37f5c4735157d1ad9550012 Author: Translation commit bot Date: Fri Aug 4 02:16:59 2017 + Update translations for https_everywhere_completed --- templates/https-everywhere.dtd | 13 + 1 file changed, 13 insertions(+) diff

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

commit 5822d9c8d465d67ab060db30a1a11e7e389e3a5a Author: Translation commit bot Date: Fri Aug 4 01:49:30 2017 + Update translations for tor-messenger-prefsdtd --- ms_MY/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tor-messenger-uiproperties] Update translations for tor-messenger-uiproperties

commit 62fa98077683f45968500cdc0abf2aea10cb5d32 Author: Translation commit bot Date: Fri Aug 4 01:49:56 2017 + Update translations for tor-messenger-uiproperties --- ms_MY/ui.properties | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

commit 5d4fbb2639b73330cd40f72352b175f6d06c29dc Author: Translation commit bot Date: Fri Aug 4 04:45:31 2017 + Update translations for https_everywhere --- zh_CN/https-everywhere.dtd | 24 1 file changed, 12 insertions(+), 12

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

commit caa11b419cd2816f42da14182c1f960e4d41d10f Author: Translation commit bot Date: Fri Aug 4 04:45:40 2017 + Update translations for https_everywhere_completed --- zh_CN/https-everywhere.dtd | 13 + 1 file changed, 13 insertions(+) diff --git

[tor-commits] [torbutton/master] fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog.

commit d48388d248ddf23150e70c7f0e4b84109e793a0d Author: Kathy Brade Date: Thu Jul 20 17:11:53 2017 -0400 fixup! Bug 19273: Avoid JavaScript patching of the external app helper dialog. For compatibility with recent changes to our browser patch, change the

[tor-commits] [torbutton/master] Changelog update and version bump

commit 6c76c3083f5ed221deddc51d13e09e8f8b6418f4 Author: Georg Koppen Date: Fri Aug 4 05:33:06 2017 + Changelog update and version bump --- src/CHANGELOG | 13 + src/install.rdf | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Don't send missing X-Desc-Gen-Reason on startup

commit 7f329206488cf844aee33fbd2e9724c72421b6af Author: Nick Mathewson Date: Tue Jul 11 10:36:55 2017 -0400 Don't send missing X-Desc-Gen-Reason on startup Since we start with desc_clean_since = 0, we should have been starting with non-null

[tor-commits] [tor/master] Merge branch 'bug22885_squashed'

commit 96cf608b2eeb4643290917b093ae9bd1c1364700 Merge: 40c7871f4 7f3292064 Author: Nick Mathewson Date: Thu Aug 3 09:33:40 2017 -0400 Merge branch 'bug22885_squashed' changes/bug22885 | 5 + src/or/router.c | 2 +- 2 files changed, 6 insertions(+), 1

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

commit b13bf65062c5918e90cb72c622ef8bdc29d53c20 Merge: e220e6e43 3e68db02c Author: Nick Mathewson Date: Thu Aug 3 09:10:58 2017 -0400 Merge branch 'bug23081_025' into maint-0.3.1 changes/bug23081 | 8 src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

[tor-commits] [tor/maint-0.3.1] In ntmain, call set_main_thread() before running the loop.

commit 3e68db02c45ea06c3f20854df1f76894424d4357 Author: Nick Mathewson Date: Thu Aug 3 09:07:28 2017 -0400 In ntmain, call set_main_thread() before running the loop. Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when

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

commit b13bf65062c5918e90cb72c622ef8bdc29d53c20 Merge: e220e6e43 3e68db02c Author: Nick Mathewson Date: Thu Aug 3 09:10:58 2017 -0400 Merge branch 'bug23081_025' into maint-0.3.1 changes/bug23081 | 8 src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

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

commit 8e451c5c7c22ed2f48d2378aecfbbc9ae851090a Merge: e084fa419 b13bf6506 Author: Nick Mathewson Date: Thu Aug 3 09:11:03 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23081 | 8 src/or/ntmain.c | 1 + 2 files changed, 9

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

commit 17073d7234031c31810837d2f540c0c6c859 Merge: 2624cd63e b13bf6506 Author: Nick Mathewson Date: Thu Aug 3 09:11:03 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23081 | 8 src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

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

commit b13bf65062c5918e90cb72c622ef8bdc29d53c20 Merge: e220e6e43 3e68db02c Author: Nick Mathewson Date: Thu Aug 3 09:10:58 2017 -0400 Merge branch 'bug23081_025' into maint-0.3.1 changes/bug23081 | 8 src/or/ntmain.c | 1 + 2 files changed, 9 insertions(+)

[tor-commits] [tor/master] In ntmain, call set_main_thread() before running the loop.

commit 3e68db02c45ea06c3f20854df1f76894424d4357 Author: Nick Mathewson Date: Thu Aug 3 09:07:28 2017 -0400 In ntmain, call set_main_thread() before running the loop. Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when

[tor-commits] [tor/release-0.3.1] In ntmain, call set_main_thread() before running the loop.

commit 3e68db02c45ea06c3f20854df1f76894424d4357 Author: Nick Mathewson Date: Thu Aug 3 09:07:28 2017 -0400 In ntmain, call set_main_thread() before running the loop. Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when

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

commit 1168e21b45cb981463fa77a45c2e697bb75d573c Merge: b13bf6506 b548371f7 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files

[tor-commits] [tor/master] hs: Cleanup logging statement in hs_intropoint.c

commit ff9c52966796bae56cd216697ba879c06f806034 Author: David Goulet Date: Tue Aug 1 14:15:47 2017 -0400 hs: Cleanup logging statement in hs_intropoint.c One log statement was a warning and has been forgotten. It is triggered for a successful attempt

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0

commit b548371f76f5284d3f96f13b52a3f46b38d14960 Merge: f33c96610 ff9c52966 Author: Nick Mathewson Date: Thu Aug 3 09:12:23 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0 changes/bug23078 | 7 +++ src/or/hs_intropoint.c

[tor-commits] [tor/maint-0.3.0] hs: Cleanup logging statement in hs_intropoint.c

commit ff9c52966796bae56cd216697ba879c06f806034 Author: David Goulet Date: Tue Aug 1 14:15:47 2017 -0400 hs: Cleanup logging statement in hs_intropoint.c One log statement was a warning and has been forgotten. It is triggered for a successful attempt

[tor-commits] [tor/maint-0.3.0] Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0

commit b548371f76f5284d3f96f13b52a3f46b38d14960 Merge: f33c96610 ff9c52966 Author: Nick Mathewson Date: Thu Aug 3 09:12:23 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0 changes/bug23078 | 7 +++ src/or/hs_intropoint.c

[tor-commits] [tor/maint-0.3.1] hs: Cleanup logging statement in hs_intropoint.c

commit ff9c52966796bae56cd216697ba879c06f806034 Author: David Goulet Date: Tue Aug 1 14:15:47 2017 -0400 hs: Cleanup logging statement in hs_intropoint.c One log statement was a warning and has been forgotten. It is triggered for a successful attempt

[tor-commits] [tor/release-0.3.0] Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0

commit b548371f76f5284d3f96f13b52a3f46b38d14960 Merge: f33c96610 ff9c52966 Author: Nick Mathewson Date: Thu Aug 3 09:12:23 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0 changes/bug23078 | 7 +++ src/or/hs_intropoint.c

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

commit 40c7871f46bbfe03480eb159e5365f49e6df24f5 Merge: 17073d723 1168e21b4 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files changed, 11

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

commit 1168e21b45cb981463fa77a45c2e697bb75d573c Merge: b13bf6506 b548371f7 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files

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

commit 923efa3db83870e7c8cf904fd36727725ef23f6d Merge: 75e084389 b548371f7 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0

commit b548371f76f5284d3f96f13b52a3f46b38d14960 Merge: f33c96610 ff9c52966 Author: Nick Mathewson Date: Thu Aug 3 09:12:23 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0 changes/bug23078 | 7 +++ src/or/hs_intropoint.c

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0

commit b548371f76f5284d3f96f13b52a3f46b38d14960 Merge: f33c96610 ff9c52966 Author: Nick Mathewson Date: Thu Aug 3 09:12:23 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0 changes/bug23078 | 7 +++ src/or/hs_intropoint.c

[tor-commits] [tor/release-0.3.1] hs: Cleanup logging statement in hs_intropoint.c

commit ff9c52966796bae56cd216697ba879c06f806034 Author: David Goulet Date: Tue Aug 1 14:15:47 2017 -0400 hs: Cleanup logging statement in hs_intropoint.c One log statement was a warning and has been forgotten. It is triggered for a successful attempt

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

commit 1168e21b45cb981463fa77a45c2e697bb75d573c Merge: b13bf6506 b548371f7 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files

[tor-commits] [tor/release-0.3.0] hs: Cleanup logging statement in hs_intropoint.c

commit ff9c52966796bae56cd216697ba879c06f806034 Author: David Goulet Date: Tue Aug 1 14:15:47 2017 -0400 hs: Cleanup logging statement in hs_intropoint.c One log statement was a warning and has been forgotten. It is triggered for a successful attempt

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

commit f248a4a38ee74663a1223dc2f1d083d50dc1f18d Merge: 8e451c5c7 1168e21b4 Author: Nick Mathewson Date: Thu Aug 3 09:14:12 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23078 | 7 +++ src/or/hs_intropoint.c | 11 --- 2 files

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

commit 02fcb29d11abe9556ab4d118f2f89e557d1751dd Merge: c4c5077af e220e6e43 Author: Nick Mathewson Date: Thu Aug 3 08:44:32 2017 -0400 Merge branch 'maint-0.3.1' changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit f33c96610f143c71c0309c1021821ab05878f8a0 Merge: 8925e84be 969602159 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 4e10ada1e8262a3d8038f09eca1b92570a12c59d Merge: 2e2ec4cb5 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit f33c96610f143c71c0309c1021821ab05878f8a0 Merge: 8925e84be 969602159 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit e220e6e4372dad90cac9138ec21ea91d4f6df7ca Merge: a9a8d53de f33c96610 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [tor/maint-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit e220e6e4372dad90cac9138ec21ea91d4f6df7ca Merge: a9a8d53de f33c96610 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit f33c96610f143c71c0309c1021821ab05878f8a0 Merge: 8925e84be 969602159 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [tor/maint-0.2.8] Merge branch 'maint-0.2.5' into maint-0.2.8

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit fa22cc651461b05f4c421e82f85d59f55e7c631d Merge: 14f3f8e34 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit f33c96610f143c71c0309c1021821ab05878f8a0 Merge: 8925e84be 969602159 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [metrics-web/master] Update news.json to version 108 of doc/MetricsTimeline.

commit d23540b70c783b70482d2b2e08764181ae9db089 Author: Karsten Loesing Date: Thu Aug 3 14:19:17 2017 +0200 Update news.json to version 108 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 84 ++-- 1 file changed,

[tor-commits] [metrics-web/master] Update metrics-lib subproject.

commit 356f6bbdee8ec2600fe16de9676c2912e03925f4 Author: Karsten Loesing Date: Thu Aug 3 14:20:05 2017 +0200 Update metrics-lib subproject. --- submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submods/metrics-lib

[tor-commits] [tor/master] add changes file for STRUCT_OFFSET removeal (22521)

commit 2624cd63eeeb72323db1d8ab39d6e1829d77d3c5 Author: Nick Mathewson Date: Thu Aug 3 08:57:52 2017 -0400 add changes file for STRUCT_OFFSET removeal (22521) --- changes/ticket22521 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket22521

[tor-commits] [metrics-web/master] Fix inconsistencies between news.json and wiki.

commit c273a5af76d3e4a0d7b694afa8b2821342adc4c7 Author: Karsten Loesing Date: Thu Aug 3 12:10:04 2017 +0200 Fix inconsistencies between news.json and wiki. --- website/src/main/resources/etc/news.json | 29 + 1 file changed, 13

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

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [tor/master] Merge branch 'maint-0.2.5' into maint-0.2.8

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit f33c96610f143c71c0309c1021821ab05878f8a0 Merge: 8925e84be 969602159 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.8

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 75e0843893b9f050352f8a16abd1004882ff76a4 Merge: abe5b07c1 f33c96610 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 9914f906e332e93ae9e4116f015f7c23ab733a38 Merge: ad54a025d 969602159 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 9696021593d28a7ae3b6a88ac57ff31234b469f5 Merge: 58e1c6dd8 93b28972c Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit 93b28972c10cfc87ab1865bead3ba713901d9d79 Merge: 0e7558ab6 1280de42a Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit e220e6e4372dad90cac9138ec21ea91d4f6df7ca Merge: a9a8d53de f33c96610 Author: Nick Mathewson Date: Thu Aug 3 08:44:31 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796

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

commit e084fa419a77c21c810ef6c65287259e1c9bdd32 Merge: 3938692f3 e220e6e43 Author: Nick Mathewson Date: Thu Aug 3 08:44:32 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-august2017 | 4 + src/config/geoip | 10796

[tor-commits] [tor/master] Switch to offsetof()

commit 5ee6ca8da22ad8da94c829e6c02c05920742c364 Author: Neel Chauhan Date: Mon Jul 31 19:30:30 2017 -0400 Switch to offsetof() --- src/common/container.c | 4 ++-- src/common/crypto.c | 2 +- src/common/memarea.c | 3 ++- src/common/util.h