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

commit 5d830f19add5869eeb9598a92044787a6b080603 Author: Translation commit bot Date: Tue Jan 9 07:48:46 2018 + Update translations for torbutton-abouttorproperties --- zh_TW/abouttor.properties | 16 1 file changed, 8 insertions(+), 8

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

commit 2101d96322f4a58f0aff1502931908c79f4f3dd8 Author: Translation commit bot Date: Tue Jan 9 07:48:52 2018 + Update translations for torbutton-abouttorproperties_completed --- zh_TW/abouttor.properties | 11 +++ 1 file changed, 11 insertions(+)

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

commit 4de25347566d6e124528e0c641040b10fd408ed5 Author: Translation commit bot Date: Tue Jan 9 07:47:19 2018 + Update translations for tails-misc_completed --- zh_TW.po | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git

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

commit 1573c4829d1bcb2795ae279703f91b4e42849f36 Author: Translation commit bot Date: Tue Jan 9 07:47:14 2018 + Update translations for tails-misc --- zh_TW.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zh_TW.po b/zh_TW.po

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

commit 1c7787989070cd517cd187fa9d13f480e1f71074 Author: Translation commit bot Date: Tue Jan 9 07:45:55 2018 + Update translations for https_everywhere_completed --- zh_TW/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git

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

commit 0c939aa8fc4c0450afbbfe61f030bbbd72c97423 Author: Translation commit bot Date: Tue Jan 9 07:45:42 2018 + Update translations for https_everywhere --- zh_TW/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [atlas/master] Bump cache breaker

commit d5d5e73acc2f4490e58f61b7bda475ebfc8b0871 Author: Iain R. Learmonth Date: Tue Jan 9 01:21:31 2018 + Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index d9d354c..77af2d4 100644 ---

[tor-commits] [atlas/master] Update fallback directory list

commit 11e969f4d185a9a44ce0dabe5e0ddc297680e45b Author: Iain R. Learmonth Date: Tue Jan 9 01:20:26 2018 + Update fallback directory list --- js/fallback_dir.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/fallback_dir.js b/js/fallback_dir.js

[tor-commits] [tor/release-0.3.2] Try to write a blurb

commit 9e8b762fcecfece64aae70ae640aaa59fd227ca5 Author: Nick Mathewson Date: Mon Jan 8 16:23:29 2018 -0500 Try to write a blurb --- ChangeLog| 7 ++- ReleaseNotes | 7 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog

[tor-commits] [tor/release-0.3.2] hidden->onion

commit 02c5ca6ace571efe327efd9cb3997fe43602cbe0 Author: Nick Mathewson Date: Mon Jan 8 16:09:07 2018 -0500 hidden->onion --- ReleaseNotes | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index

[tor-commits] [tor/release-0.3.2] Add links for blog posts

commit e985afa43cdf89c697eabe17e22a129f1d8f396d Author: Nick Mathewson Date: Mon Jan 8 16:08:57 2018 -0500 Add links for blog posts --- ReleaseNotes | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index

[tor-commits] [tor/release-0.3.2] coalesce common sections, sort sections a bit, add more notes

commit b70f3032070b05d6acd866089dc9ea063aab4712 Author: Nick Mathewson Date: Mon Jan 8 16:01:55 2018 -0500 coalesce common sections, sort sections a bit, add more notes --- ReleaseNotes | 184 --- 1 file

[tor-commits] [tor/release-0.3.2] Remove all "bugfix on 0.3.2.x" entries from ReleaseNotes.

commit ece3e770668ca15c2d9aaf562e9d61d21f7f348d Author: Nick Mathewson Date: Mon Jan 8 15:47:03 2018 -0500 Remove all "bugfix on 0.3.2.x" entries from ReleaseNotes. Since the ReleaseNotes only reports the changes since the last stable release, we don't

[tor-commits] [tor/release-0.3.2] Use format_changelog --no-wrap to sort the releasenotes by section.

commit 971d634b63a352359ec6780169fda6fbd62c4a2b Author: Nick Mathewson Date: Mon Jan 8 15:43:43 2018 -0500 Use format_changelog --no-wrap to sort the releasenotes by section. --- ReleaseNotes | 1207 -- 1 file

[tor-commits] [tor/release-0.3.2] Start work on 0.3.2.9 releasenotes

commit 474d4006ab55f846b4c147ef3cabbee27283d8d1 Author: Nick Mathewson Date: Mon Jan 8 15:42:44 2018 -0500 Start work on 0.3.2.9 releasenotes Copy the changelogs from all 0.3.2.x releases, unsorted and unedited. --- ReleaseNotes | 987

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

commit 960b46ed7554cb0b113d7fe0f3f6b4c665876636 Author: Translation commit bot Date: Mon Jan 8 18:47:45 2018 + Update translations for torbutton-torbuttonproperties --- sv/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [tor/release-0.3.2] Start 0.3.2.9 changelog.

commit ea6f3e329d4609aca2c38075f0cbb2e959c178f2 Author: Nick Mathewson Date: Mon Jan 8 11:45:21 2018 -0500 Start 0.3.2.9 changelog. --- ChangeLog| 46 ++ changes/bug24633 | 5 - changes/bug24634

[tor-commits] [tor/master] Increment version to 0.3.2.9

commit 1f7f930f9ef27a5fd289df23695df97d0fe262b7 Author: Nick Mathewson Date: Mon Jan 8 11:39:24 2018 -0500 Increment version to 0.3.2.9 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

commit 43937b9d6485674153c0dc69c39ca6a148de1a1c Merge: 9ba69be96 1f7f930f9 Author: Nick Mathewson Date: Mon Jan 8 11:39:38 2018 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid version bump. ___ tor-commits

[tor-commits] [tor/release-0.3.2] Increment version to 0.3.2.9

commit 1f7f930f9ef27a5fd289df23695df97d0fe262b7 Author: Nick Mathewson Date: Mon Jan 8 11:39:24 2018 -0500 Increment version to 0.3.2.9 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

commit 58474f7bb1e13ca61a0e52f13d8502cc334813bb Merge: 5ff2d8d77 1f7f930f9 Author: Nick Mathewson Date: Mon Jan 8 11:39:48 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +-

[tor-commits] [tor/maint-0.3.2] Increment version to 0.3.2.9

commit 1f7f930f9ef27a5fd289df23695df97d0fe262b7 Author: Nick Mathewson Date: Mon Jan 8 11:39:24 2018 -0500 Increment version to 0.3.2.9 --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2

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

commit 1c5c5f0e50084c7a36991212ddf21295306da17f Merge: 748ad2124 e3ab27001 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit 5ff2d8d7706f1f1d7790185b76ddfc8a7c575e01 Merge: efba81e3b 1c5c5f0e5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit e8fdac77552db29b0349bd823358fe8dd5209155 Merge: b650191b9 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7 Merge: 8042c356f 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit e3ab27001f81dc05eb1dd1ac8371a35ccce2b50d Merge: a1ce1ab20 b85fa0bd5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7 Merge: 8042c356f 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/release-0.3.1] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

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

commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7 Merge: 8042c356f 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/release-0.2.9] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/release-0.3.0] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/release-0.3.1] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/release-0.3.0] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

[tor-commits] [tor/release-0.3.2] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

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

commit 9ba69be96c102ff47c79f8e332127599d8ebe18e Merge: d63746812 1c5c5f0e5 Author: Nick Mathewson Date: Mon Jan 8 11:10:53 2018 -0500 Merge branch 'maint-0.3.2' There was a merge conflict on fallback_dirs.inc, which we resolve in favor of the newly

[tor-commits] [tor/release-0.3.0] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

[tor-commits] [tor/master] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

[tor-commits] [tor/release-0.2.9] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

[tor-commits] [tor/release-0.3.2] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

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

commit 2ffdf43e705d416142683c414fbc18f937834cdc Merge: f3ea41211 b85fa0bd5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/release-0.3.1] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

[tor-commits] [tor/release-0.3.2] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/release-0.2.9] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

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

commit f9fe48989be0a770a36c9af935c73edfec031ba7 Merge: 0e5140320 e3ab27001 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit e3ab27001f81dc05eb1dd1ac8371a35ccce2b50d Merge: a1ce1ab20 b85fa0bd5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit e3ab27001f81dc05eb1dd1ac8371a35ccce2b50d Merge: a1ce1ab20 b85fa0bd5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/master] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

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

commit 1c5c5f0e50084c7a36991212ddf21295306da17f Merge: 748ad2124 e3ab27001 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7 Merge: 8042c356f 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit e3ab27001f81dc05eb1dd1ac8371a35ccce2b50d Merge: a1ce1ab20 b85fa0bd5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

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

commit 1c5c5f0e50084c7a36991212ddf21295306da17f Merge: 748ad2124 e3ab27001 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/maint-0.3.0] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/maint-0.3.2] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

[tor-commits] [tor/master] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

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

commit e3ab27001f81dc05eb1dd1ac8371a35ccce2b50d Merge: a1ce1ab20 b85fa0bd5 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/maint-0.3.1] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

[tor-commits] [tor/maint-0.3.2] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/maint-0.3.0] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

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

commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7 Merge: 8042c356f 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/maint-0.3.1] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

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

commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7 Merge: 8042c356f 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/maint-0.3.2] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

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

commit b85fa0bd5fc95f831cfd416b3ec5bbdd7bc846a7 Merge: 8042c356f 9464da210 Author: Nick Mathewson Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968

[tor-commits] [tor/maint-0.2.9] Add changes file for new fallback directory list.

commit 9464da210d3214fc094f5fc3b2c229470dbea59c Author: Nick Mathewson Date: Mon Jan 8 11:09:08 2018 -0500 Add changes file for new fallback directory list. --- changes/ticket_24801 | 5 + 1 file changed, 5 insertions(+) diff --git a/changes/ticket_24801

[tor-commits] [tor/maint-0.2.9] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/maint-0.3.1] Add 7 other fallback dirs from teor's tests

commit a42e52dded44a2c58a7200511e27a5c0e01cd78b Author: Nick Mathewson Date: Mon Jan 8 11:03:44 2018 -0500 Add 7 other fallback dirs from teor's tests These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc" --- src/or/fallback_dirs.inc | 45

[tor-commits] [tor/maint-0.2.9] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

[tor-commits] [tor/maint-0.3.0] Update the fallback_dirs.inc file: part 1

commit 491c09c19a842b7c3d67ad25dd5b14aeec9b665b Author: Nick Mathewson Date: Mon Jan 8 10:57:06 2018 -0500 Update the fallback_dirs.inc file: part 1 This takes the updated fallback_dirs_2018_01_06_CA.inc from pastly's scan. --- src/or/fallback_dirs.inc |

[tor-commits] [tor/master] avoid calling format_iso_time() with TIME_MAX

commit 40cd992abbd4d06023cf14c39c337e4aa62416ec Author: Roger Dingledine Date: Sun Jan 7 02:15:18 2018 -0500 avoid calling format_iso_time() with TIME_MAX If we tried to move a descriptor from routerlist->old_routers back into the current routerlist, we

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug24555'

commit d6374681281c64156bf282bdb65ddd9ac7c881e7 Merge: 942fa0c4a 40cd992ab Author: Nick Mathewson Date: Mon Jan 8 10:45:40 2018 -0500 Merge remote-tracking branch 'arma/bug24555' src/or/routerlist.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-)

[tor-commits] [torspec/master] Merge remote-tracking branch 'teor/fallback-format-2-v4'

commit b2a466b9af62c0f633af76d66f121902b5fd941b Merge: a76eaa6 2b2ad53 Author: Nick Mathewson Date: Mon Jan 8 09:38:40 2018 -0500 Merge remote-tracking branch 'teor/fallback-format-2-v4' dir-list-spec.txt | 451 ++

[tor-commits] [torspec/master] Add dir-list-spec.txt, a description of Tor's fallback directory list format

commit 2b2ad532ec4454c762a881fbad5b9d1d1d42dd51 Author: teor Date: Tue Dec 26 18:38:03 2017 +1100 Add dir-list-spec.txt, a description of Tor's fallback directory list format Incorporates changes based on atagar's review on #24742. Documents the

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

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb Merge: c52d4d9e3 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit a1ce1ab201e4ca46cd3caa3fc3c9bd692d2de3b1 Merge: 48d94e290 8042c356f Author: Nick Mathewson Date: Mon Jan 8 09:34:57 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit a1ce1ab201e4ca46cd3caa3fc3c9bd692d2de3b1 Merge: 48d94e290 8042c356f Author: Nick Mathewson Date: Mon Jan 8 09:34:57 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 8042c356f4904107b0357d95d19f2c72f1d13cb5 Merge: 16fd975a8 26e28829d Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit efba81e3bb53ede274cbb139a15f318aab681d42 Merge: 0d172c118 748ad2124 Author: Nick Mathewson Date: Mon Jan 8 09:35:55 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 748ad2124db0b19861300d984a350519cc0a8bb1 Merge: 5f2c7a856 a1ce1ab20 Author: Nick Mathewson Date: Mon Jan 8 09:35:55 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 942fa0c4a21c9e2cf3b75b0d014f386a7615d983 Merge: 44aa1adf3 748ad2124 Author: Nick Mathewson Date: Mon Jan 8 09:35:55 2018 -0500 Merge branch 'maint-0.3.2' changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 8042c356f4904107b0357d95d19f2c72f1d13cb5 Merge: 16fd975a8 26e28829d Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 8042c356f4904107b0357d95d19f2c72f1d13cb5 Merge: 16fd975a8 26e28829d Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 748ad2124db0b19861300d984a350519cc0a8bb1 Merge: 5f2c7a856 a1ce1ab20 Author: Nick Mathewson Date: Mon Jan 8 09:35:55 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit a1ce1ab201e4ca46cd3caa3fc3c9bd692d2de3b1 Merge: 48d94e290 8042c356f Author: Nick Mathewson Date: Mon Jan 8 09:34:57 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 748ad2124db0b19861300d984a350519cc0a8bb1 Merge: 5f2c7a856 a1ce1ab20 Author: Nick Mathewson Date: Mon Jan 8 09:35:55 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb Merge: c52d4d9e3 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 0e5140320bfb4517b3bc971f77e3348d31756329 Merge: e9a102ff5 a1ce1ab20 Author: Nick Mathewson Date: Mon Jan 8 09:34:57 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 8042c356f4904107b0357d95d19f2c72f1d13cb5 Merge: 16fd975a8 26e28829d Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb Merge: c52d4d9e3 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb Merge: c52d4d9e3 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 8042c356f4904107b0357d95d19f2c72f1d13cb5 Merge: 16fd975a8 26e28829d Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit a1ce1ab201e4ca46cd3caa3fc3c9bd692d2de3b1 Merge: 48d94e290 8042c356f Author: Nick Mathewson Date: Mon Jan 8 09:34:57 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb Merge: c52d4d9e3 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb Merge: c52d4d9e3 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit f3ea412110dea8f621c0b67706ba024a023c76a6 Merge: 7c411bba8 8042c356f Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit b650191b9c4960f37a5343db33887165094147ee Merge: 74842cce6 26e28829d Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 8042c356f4904107b0357d95d19f2c72f1d13cb5 Merge: 16fd975a8 26e28829d Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit e212c752f26a3c387ccda6beb2cb6c264a0ba98d Merge: eb0c7ab43 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit a1ce1ab201e4ca46cd3caa3fc3c9bd692d2de3b1 Merge: 48d94e290 8042c356f Author: Nick Mathewson Date: Mon Jan 8 09:34:57 2018 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

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

commit 26e28829da63dffe9c104e5e43d53be22bb59aeb Merge: c52d4d9e3 8efbeb098 Author: Nick Mathewson Date: Mon Jan 8 09:34:56 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 changes/geoip-2018-01-05 | 4 + src/config/geoip | 31441

  1   2   >