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

2017-12-21 Thread translation
commit e913845a1d102e34ffb360e23239b89f013b06b0 Author: Translation commit bot Date: Fri Dec 22 05:50:30 2017 + Update translations for exoneratorproperties --- mk/exonerator.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2017-12-21 Thread translation
commit 0c52936105e1747ac0368615e767490a4c615cdd Author: Translation commit bot Date: Fri Dec 22 05:16:26 2017 + Update translations for mat-gui --- mk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk.po b/mk.po index

[tor-commits] [bridgedb/develop] Merge branch 'fix/24701' into develop

2017-12-21 Thread isis
commit c6c9f47968368f987dd0b9edefdf55ea4f0b1ad2 Merge: 637e1fc 0f03fb6 Author: Isis Lovecruft Date: Fri Dec 22 03:20:32 2017 + Merge branch 'fix/24701' into develop bridgedb/distributors/https/server.py | 43 +++

[tor-commits] [bridgedb/develop] Delay and then redirect malicious requests.

2017-12-21 Thread isis
commit 0f03fb65518353e1409e08def7201ea17fe1318f Author: Isis Lovecruft Date: Fri Dec 22 01:45:52 2017 + Delay and then redirect malicious requests. * FIXES #24701: https://bugs.torproject.org/24701 --- bridgedb/distributors/https/server.py | 43

[tor-commits] [bridgedb/develop] Merge branch 'fix/24704' into develop

2017-12-21 Thread isis
commit 637e1fc2a4e09ec8ad5a2442db2298d3666897eb Merge: 1096bf4 ad26965 Author: Isis Lovecruft Date: Fri Dec 22 02:41:46 2017 + Merge branch 'fix/24704' into develop bridgedb/Bridges.py| 52

[tor-commits] [bridgedb/develop] Filter returned bridges to avoid multiples from the same /16 or /32.

2017-12-21 Thread isis
commit ad269657fe16f2603f207bdb2a979266c3b918e8 Author: Isis Lovecruft Date: Fri Dec 22 02:34:32 2017 + Filter returned bridges to avoid multiples from the same /16 or /32. * FIXES #24704 https://bugs.torproject.org/24704 --- bridgedb/Bridges.py

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

2017-12-21 Thread translation
commit 067d58e99c5816f398806520144eea4cc4d8d563 Author: Translation commit bot Date: Fri Dec 22 00:20:20 2017 + Update translations for tails-greeter-2 --- mk/mk.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/mk.po b/mk/mk.po

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

2017-12-21 Thread translation
commit 451f5b3f51402dfa28f3950fef925e42c7e8caee Author: Translation commit bot Date: Thu Dec 21 23:49:24 2017 + Update translations for tor-messenger-fingerdtd --- mk/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread translation
commit 27471ef07a47c35292220afeada38e9119adbfdd Author: Translation commit bot Date: Thu Dec 21 20:19:42 2017 + Update translations for tails-onioncircuits --- fr/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread translation
commit 68e16f06fddfaa0480933b8e5538f93d1b7f9155 Author: Translation commit bot Date: Thu Dec 21 20:19:48 2017 + Update translations for tails-onioncircuits_completed --- fr/onioncircuits.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2017-12-21 Thread translation
commit f8973c628446edc902190709c5d0349392cf8fec Author: Translation commit bot Date: Thu Dec 21 20:19:21 2017 + Update translations for tails-openpgp-applet --- fr/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2017-12-21 Thread translation
commit 84d1099c8358bd305b77ca264a8c45b3118dbafa Author: Translation commit bot Date: Thu Dec 21 20:19:27 2017 + Update translations for tails-openpgp-applet_completed --- fr/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2017-12-21 Thread translation
commit 2493e9133c17578a3511951ee6dfc5ff7a2ae101 Author: Translation commit bot Date: Thu Dec 21 20:18:42 2017 + Update translations for tor-and-https --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

[tor-commits] [translation/tor-and-https_completed] Update translations for tor-and-https_completed

2017-12-21 Thread translation
commit ad23d7ac720dc1f2dd187efa812349bdeb52a688 Author: Translation commit bot Date: Thu Dec 21 20:18:47 2017 + Update translations for tor-and-https_completed --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

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

2017-12-21 Thread translation
commit e2190733889ef8aa29733e537a931e58fc1889ac Author: Translation commit bot Date: Thu Dec 21 20:18:30 2017 + Update translations for tails-perl5lib --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

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

2017-12-21 Thread translation
commit b62e7d2074803d7559afd41aa7971463b18dc08a Author: Translation commit bot Date: Thu Dec 21 20:18:35 2017 + Update translations for tails-perl5lib_completed --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po

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

2017-12-21 Thread translation
commit 793d8afad467a0db3faaf20100274fb5d31a47f6 Author: Translation commit bot Date: Thu Dec 21 20:17:26 2017 + Update translations for tails-misc --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

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

2017-12-21 Thread translation
commit 3ca2b44ef0510a7681c0279acdd1c38737d77159 Author: Translation commit bot Date: Thu Dec 21 20:17:32 2017 + Update translations for tails-misc_completed --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2017-12-21 Thread translation
commit 8abc575a6c3d9e544b338cc82f8fa8c7d77f6670 Author: Translation commit bot Date: Thu Dec 21 20:16:42 2017 + Update translations for mat-gui --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2017-12-21 Thread translation
commit 528b357ec63659186cddaabb6143be0ce551de01 Author: Translation commit bot Date: Thu Dec 21 20:16:48 2017 + Update translations for mat-gui_completed --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2017-12-21 Thread translation
commit 628d50235487ddf5aa0f2142bc01ac81f0db6257 Author: Translation commit bot Date: Thu Dec 21 20:16:20 2017 + Update translations for tails-persistence-setup_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2017-12-21 Thread translation
commit 17cfd77dab8926664ca6585c7bb03b5109a744c5 Author: Translation commit bot Date: Thu Dec 21 20:16:13 2017 + Update translations for tails-persistence-setup --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po

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

2017-12-21 Thread translation
commit e8bd9b71853581c7058865493f5c26cd0a390aa5 Author: Translation commit bot Date: Thu Dec 21 20:15:29 2017 + Update translations for whisperback --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index

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

2017-12-21 Thread translation
commit 64cee9d93c46ca96fdc571632fb49fb10286481a Author: Translation commit bot Date: Thu Dec 21 20:15:35 2017 + Update translations for whisperback_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po

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

2017-12-21 Thread translation
commit 1aa2ff6b32283e81c9a959778c110b3f4e069815 Author: Translation commit bot Date: Thu Dec 21 20:15:12 2017 + Update translations for bridgedb_completed --- fr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread translation
commit 31e186732240c427ca46193f4bf5666ca685e6b1 Author: Translation commit bot Date: Thu Dec 21 20:15:06 2017 + Update translations for bridgedb --- fr/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread nickm
commit 11336cfa0997709176bc912fde71338eaeab3851 Merge: 63b84335d 94c59851d Author: Nick Mathewson Date: Thu Dec 21 14:23:06 2017 -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/master] Increment version to 0.3.2.8-rc-dev

2017-12-21 Thread nickm
commit 94c59851df353442ca5e56119ae4b0affa630e56 Author: Nick Mathewson Date: Thu Dec 21 14:22:54 2017 -0500 Increment version to 0.3.2.8-rc-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/release-0.3.2] Increment version to 0.3.2.8-rc-dev

2017-12-21 Thread nickm
commit 94c59851df353442ca5e56119ae4b0affa630e56 Author: Nick Mathewson Date: Thu Dec 21 14:22:54 2017 -0500 Increment version to 0.3.2.8-rc-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

2017-12-21 Thread nickm
commit f5d89fab2525fd8a105f9f0ea9258147bf16290e Merge: 20e9b428c 94c59851d Author: Nick Mathewson Date: Thu Dec 21 14:22:58 2017 -0500 Merge branch 'maint-0.3.2' "ours" to avoid version bump. ___ tor-commits

[tor-commits] [tor/maint-0.3.2] Increment version to 0.3.2.8-rc-dev

2017-12-21 Thread nickm
commit 94c59851df353442ca5e56119ae4b0affa630e56 Author: Nick Mathewson Date: Thu Dec 21 14:22:54 2017 -0500 Increment version to 0.3.2.8-rc-dev --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/master] forward-port the 0.3.2.8-rc changelog

2017-12-21 Thread nickm
commit 20e9b428c210913d1a95c43b514f466a56c4833f Author: Nick Mathewson Date: Thu Dec 21 14:22:30 2017 -0500 forward-port the 0.3.2.8-rc changelog --- ChangeLog | 44 1 file changed, 44 insertions(+) diff --git a/ChangeLog

[tor-commits] [webwml/master] tor 0.3.2.8-rc is released

2017-12-21 Thread nickm
commit be812bbffdbcd43746e370c0477cfaeac85edb97 Author: Nick Mathewson Date: Thu Dec 21 14:16:53 2017 -0500 tor 0.3.2.8-rc is released --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/master] scan-build: Replace some test-assertions with fatal assertions

2017-12-21 Thread nickm
commit 713a71702201d80b95605a2af1392a7fb7ab0227 Author: Nick Mathewson Date: Thu Dec 21 13:26:57 2017 -0500 scan-build: Replace some test-assertions with fatal assertions Using tt_assert in these helpers was implying to scan-build that our 'new' functions

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

2017-12-21 Thread nickm
commit eb00840ab88f07820397e00cdc2a62b87a0f52cd Merge: 7b9e79095 1a7779966 Author: Nick Mathewson Date: Thu Dec 21 12:42:11 2017 -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.8-rc

2017-12-21 Thread nickm
commit 1a777996651bcc63e3d91391c27c5d6ec46c8015 Author: Nick Mathewson Date: Thu Dec 21 12:42:00 2017 -0500 Increment version to 0.3.2.8-rc --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/maint-0.3.2] Increment version to 0.3.2.8-rc

2017-12-21 Thread nickm
commit 1a777996651bcc63e3d91391c27c5d6ec46c8015 Author: Nick Mathewson Date: Thu Dec 21 12:42:00 2017 -0500 Increment version to 0.3.2.8-rc --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

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

2017-12-21 Thread nickm
commit 63b84335dc590499e5f22498383d6a3432e91ec4 Merge: afacaa02a 1a7779966 Author: Nick Mathewson Date: Thu Dec 21 12:42:22 2017 -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/master] remove changes files that appear in 0.3.2.8-rc

2017-12-21 Thread nickm
commit 7b9e790956b6af471eababed8092f47671f14efa Author: Nick Mathewson Date: Thu Dec 21 12:41:25 2017 -0500 remove changes files that appear in 0.3.2.8-rc --- changes/bug24665 | 6 -- changes/bug24666 | 7 --- changes/bug24671 | 6

[tor-commits] [tor/master] Increment version to 0.3.2.8-rc

2017-12-21 Thread nickm
commit 1a777996651bcc63e3d91391c27c5d6ec46c8015 Author: Nick Mathewson Date: Thu Dec 21 12:42:00 2017 -0500 Increment version to 0.3.2.8-rc --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/release-0.3.2] start an 0.3.2.8 changelog

2017-12-21 Thread nickm
commit 9be4b91760d5a5b5a15abe69d0015c3016c79355 Author: Nick Mathewson Date: Thu Dec 21 12:40:11 2017 -0500 start an 0.3.2.8 changelog --- ChangeLog| 44 changes/bug24665 | 6 --

[tor-commits] [tor/release-0.3.2] reflow the changelog

2017-12-21 Thread nickm
commit afacaa02a54dcdf0751529dbd8420b3e09009550 Author: Nick Mathewson Date: Thu Dec 21 12:40:32 2017 -0500 reflow the changelog --- ChangeLog | 60 ++-- 1 file changed, 30 insertions(+), 30 deletions(-) diff

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

2017-12-21 Thread nickm
commit 0d1a2e366acd98fcece78c8b4734c5507059c366 Merge: 29e23e62c 6cd567d79 Author: Nick Mathewson Date: Thu Dec 21 11:16:00 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24671| 6 ++ src/or/scheduler_kist.c | 22

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2

2017-12-21 Thread nickm
commit 6cd567d7974e6bf55874f3a6d907feb050144095 Merge: 84adb9fcc fdfa4a5a1 Author: Nick Mathewson Date: Thu Dec 21 11:13:33 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2 changes/bug24671| 6 ++

[tor-commits] [tor/release-0.3.2] sched: Use lower layer cell limit with KISTLite

2017-12-21 Thread nickm
commit fdfa4a5a140a2d82ebd92e980a577cbcecd2180b Author: David Goulet Date: Wed Dec 20 14:14:02 2017 -0500 sched: Use lower layer cell limit with KISTLite Instead of using INT_MAX as a write limit for KISTLite, use the lower layer limit which is using

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

2017-12-21 Thread nickm
commit 2b8a06a2ef23350616df755a32b0e5b87d463314 Merge: 2f0d57db5 6cd567d79 Author: Nick Mathewson Date: Thu Dec 21 11:16:00 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24671| 6 ++ src/or/scheduler_kist.c | 22 -- 2 files

[tor-commits] [tor/maint-0.3.2] sched: Use lower layer cell limit with KISTLite

2017-12-21 Thread nickm
commit fdfa4a5a140a2d82ebd92e980a577cbcecd2180b Author: David Goulet Date: Wed Dec 20 14:14:02 2017 -0500 sched: Use lower layer cell limit with KISTLite Instead of using INT_MAX as a write limit for KISTLite, use the lower layer limit which is using

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2

2017-12-21 Thread nickm
commit 6cd567d7974e6bf55874f3a6d907feb050144095 Merge: 84adb9fcc fdfa4a5a1 Author: Nick Mathewson Date: Thu Dec 21 11:13:33 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2 changes/bug24671| 6 ++

[tor-commits] [tor/master] sched: Use lower layer cell limit with KISTLite

2017-12-21 Thread nickm
commit fdfa4a5a140a2d82ebd92e980a577cbcecd2180b Author: David Goulet Date: Wed Dec 20 14:14:02 2017 -0500 sched: Use lower layer cell limit with KISTLite Instead of using INT_MAX as a write limit for KISTLite, use the lower layer limit which is using

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2

2017-12-21 Thread nickm
commit 6cd567d7974e6bf55874f3a6d907feb050144095 Merge: 84adb9fcc fdfa4a5a1 Author: Nick Mathewson Date: Thu Dec 21 11:13:33 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2 changes/bug24671| 6 ++

[tor-commits] [tor/master] Fix a compilation error in the channel tests.

2017-12-21 Thread nickm
commit 2f0d57db56f87a21e1a927a526c1a82ebd32f9f8 Author: Nick Mathewson Date: Thu Dec 21 11:10:30 2017 -0500 Fix a compilation error in the channel tests. This would only show up on systems like windows where monotime_t and monotime_coarse_t are different

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

2017-12-21 Thread nickm
commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.3.2] Move destroy cells into a separate queue type of their own, to save RAM

2017-12-21 Thread nickm
commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

[tor-commits] [tor/release-0.3.2] Move free to end of test function so coverity won't complain.

2017-12-21 Thread nickm
commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/release-0.3.2] Use monotime_coarse_absolute_msec() in destroy queue

2017-12-21 Thread nickm
commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

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

2017-12-21 Thread nickm
commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267 Merge: 08ed0d793 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:49:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 08469a338ab524e233f357d46504338fd64dedf9 Merge: 5e9264671 03b4dd92a Author: Nick Mathewson Date: Thu Dec 21 10:50:06 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 45b1c6bc8ba66a98608b5ebfaf22685a0623df31 Merge: 40faebd45 08469a338 Author: Nick Mathewson Date: Thu Dec 21 10:58:20 2017 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 08469a338ab524e233f357d46504338fd64dedf9 Merge: 5e9264671 03b4dd92a Author: Nick Mathewson Date: Thu Dec 21 10:50:06 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267 Merge: 08ed0d793 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:49:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 29e23e62c9be846ce68210d72448cf955a239d8c Merge: 88642bbdc 84adb9fcc Author: Nick Mathewson Date: Thu Dec 21 10:58:20 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 84adb9fcca3d4e1954c1dd215a3e765c689d82b3 Merge: c38157be9 08469a338 Author: Nick Mathewson Date: Thu Dec 21 10:50:33 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.3.1] Use monotime_coarse_absolute_msec() in destroy queue

2017-12-21 Thread nickm
commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

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

2017-12-21 Thread nickm
commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.3.0] Use monotime_coarse_absolute_msec() in destroy queue

2017-12-21 Thread nickm
commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

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

2017-12-21 Thread nickm
commit bcf033047d80214b453327532910969b72b72c05 Merge: 1fe6e318f 03b4dd92a Author: Nick Mathewson Date: Thu Dec 21 10:58:20 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.3.0] Move destroy cells into a separate queue type of their own, to save RAM

2017-12-21 Thread nickm
commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

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

2017-12-21 Thread nickm
commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.3.0] Move free to end of test function so coverity won't complain.

2017-12-21 Thread nickm
commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread nickm
commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.3.1] Move destroy cells into a separate queue type of their own, to save RAM

2017-12-21 Thread nickm
commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

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

2017-12-21 Thread nickm
commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267 Merge: 08ed0d793 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:49:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit cbe36a73984aa16c8fc2e2cce91c4e3b680428f0 Merge: bf8984a03 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:58:20 2017 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.3.1] Move free to end of test function so coverity won't complain.

2017-12-21 Thread nickm
commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread nickm
commit 3b08184338fd9b0b3e3bd3e5260684cd078beae0 Merge: c604a76a5 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:43:12 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.2.9] Use monotime_coarse_absolute_msec() in destroy queue

2017-12-21 Thread nickm
commit 79a50afa0e3dd44fc5ef80806ccda501fab5a718 Author: Nick Mathewson Date: Thu Dec 21 10:48:37 2017 -0500 Use monotime_coarse_absolute_msec() in destroy queue This way it will match the insert queue in 029 and later. --- src/or/relay.c | 5 + 1 file

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

2017-12-21 Thread nickm
commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/master] In 0.3.3, we use timestamps, not absolute milliseconds.

2017-12-21 Thread nickm
commit 1eeb505e6f08591c39e0a000efab3948ef1ef5b5 Author: Nick Mathewson Date: Thu Dec 21 10:57:45 2017 -0500 In 0.3.3, we use timestamps, not absolute milliseconds. --- src/or/or.h| 3 ++- src/or/relay.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

[tor-commits] [tor/release-0.2.9] Move free to end of test function so coverity won't complain.

2017-12-21 Thread nickm
commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread nickm
commit eb0c7ab43391673945e11a92c7f186620aa3a8fa Merge: ba0c0ef77 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:58:20 2017 -0500 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.2.9] Move destroy cells into a separate queue type of their own, to save RAM

2017-12-21 Thread nickm
commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

[tor-commits] [tor/release-0.2.5] Move free to end of test function so coverity won't complain.

2017-12-21 Thread nickm
commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2017-12-21 Thread nickm
commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267 Merge: 08ed0d793 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:49:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit b8a3602b2a7114f2027d4a3af27520b109762efd Merge: bcc96c77d 84adb9fcc Author: Nick Mathewson Date: Thu Dec 21 10:54:05 2017 -0500 Merge branch 'maint-0.3.2' changes/bug24666 | 7 + src/or/circuitmux.c| 34 ++--

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

2017-12-21 Thread nickm
commit 84adb9fcca3d4e1954c1dd215a3e765c689d82b3 Merge: c38157be9 08469a338 Author: Nick Mathewson Date: Thu Dec 21 10:50:33 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 89f40ba97a752f125ef7dbb057d64dd5e06a95db Merge: 2e0c22d58 7d845976e Author: Nick Mathewson Date: Thu Dec 21 10:58:20 2017 -0500 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.2.8] Move destroy cells into a separate queue type of their own, to save RAM

2017-12-21 Thread nickm
commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

[tor-commits] [tor/release-0.2.5] Move destroy cells into a separate queue type of their own, to save RAM

2017-12-21 Thread nickm
commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

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

2017-12-21 Thread nickm
commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 920208776052d2130557359a0a8077406c60dd21 Merge: 428f8a375 cd1f708a7 Author: Nick Mathewson Date: Thu Dec 21 10:40:10 2017 -0500 Merge branch 'bug24666_squashed_025' into maint-0.2.5 changes/bug24666 | 7 src/or/circuitmux.c| 34

[tor-commits] [tor/release-0.2.8] Move free to end of test function so coverity won't complain.

2017-12-21 Thread nickm
commit cd1f708a7f44ab305c9fcda0060f55f075b98362 Author: Nick Mathewson Date: Thu Dec 21 10:39:29 2017 -0500 Move free to end of test function so coverity won't complain. --- src/test/test_circuitmux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [tor/master] Move destroy cells into a separate queue type of their own, to save RAM

2017-12-21 Thread nickm
commit 520cf21793e9c6b662c76c02235315f898d10fb9 Author: Nick Mathewson Date: Tue Dec 19 13:53:52 2017 -0500 Move destroy cells into a separate queue type of their own, to save RAM We've been seeing problems with destroy cells queues taking up a huge

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

2017-12-21 Thread nickm
commit 03b4dd92a4c359fb2f699c579ed6dbcd73981267 Merge: 08ed0d793 79a50afa0 Author: Nick Mathewson Date: Thu Dec 21 10:49:40 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug24666 | 7 src/or/circuitmux.c| 34

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

2017-12-21 Thread nickm
commit 7d845976e3897fac8e78a4a26688ac57b660151b Merge: 877dd1d6c 920208776 Author: Nick Mathewson Date: Thu Dec 21 10:43:06 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.8 changes/bug24666 | 7 src/or/circuitmux.c| 34

  1   2   3   >