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

2015-03-18 Thread translation
commit e4b6225278b2090b5ac5b1bb3998652a3c675f43 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 09:47:07 2015 + Update translations for torbutton-torbuttonproperties --- ach/torbutton.properties |7 +++ ady/torbutton.properties |7

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

2015-03-18 Thread translation
commit 5ecf928ecbf4db3cf399f2ae09bae21540bd4b61 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 10:15:48 2015 + Update translations for torbutton-torbuttonproperties --- nl/torbutton.properties|8 zh_CN/torbutton.properties |8 2

[tor-commits] [tor/maint-0.2.6] remove a needless if (1) that was there for indentation; fix indentation.

2015-03-18 Thread nickm
commit 92d04721a2a614e40d6393ccc64ff2e86b71d778 Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:25:37 2015 -0400 remove a needless if (1) that was there for indentation; fix indentation. --- src/or/main.c | 76 - 1

[tor-commits] [tor/maint-0.2.6] Extract main part of main loop into a separate function

2015-03-18 Thread nickm
commit b78803f9f543c83bf50d0751eb160e80ed602eae Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:24:18 2015 -0400 Extract main part of main loop into a separate function For 15176; Shadow would like this. Based on a patch by Rob Jansen, but revised to have a

[tor-commits] [tor/maint-0.2.6] Simplify the loop.

2015-03-18 Thread nickm
commit a0f892f19094efd963564cf788be887f694be796 Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:30:08 2015 -0400 Simplify the loop. --- src/or/main.c |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index

[tor-commits] [tor/master] Add comments for new functions

2015-03-18 Thread nickm
commit ddb1889eb8bc128ec0fca35f15b1bf90d2b629ac Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:27:33 2015 -0400 Add comments for new functions --- src/or/main.c |9 + 1 file changed, 9 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index

[tor-commits] [tor/master] Simplify the loop.

2015-03-18 Thread nickm
commit a0f892f19094efd963564cf788be887f694be796 Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:30:08 2015 -0400 Simplify the loop. --- src/or/main.c |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index

[tor-commits] [tor/master] Extract main part of main loop into a separate function

2015-03-18 Thread nickm
commit b78803f9f543c83bf50d0751eb160e80ed602eae Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:24:18 2015 -0400 Extract main part of main loop into a separate function For 15176; Shadow would like this. Based on a patch by Rob Jansen, but revised to have a

[tor-commits] [tor/master] remove a needless if (1) that was there for indentation; fix indentation.

2015-03-18 Thread nickm
commit 92d04721a2a614e40d6393ccc64ff2e86b71d778 Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:25:37 2015 -0400 remove a needless if (1) that was there for indentation; fix indentation. --- src/or/main.c | 76 - 1

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-18 Thread nickm
commit d8263ac254933bb8a4809aae9ff034923e2dccae Merge: 548b4be a0f892f Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 08:58:15 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' changes/ticket15176 |3 ++ src/or/main.c | 105

[tor-commits] [tor/maint-0.2.6] Add comments for new functions

2015-03-18 Thread nickm
commit ddb1889eb8bc128ec0fca35f15b1bf90d2b629ac Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:27:33 2015 -0400 Add comments for new functions --- src/or/main.c |9 + 1 file changed, 9 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index

[tor-commits] [tor/release-0.2.6] Simplify the loop.

2015-03-18 Thread nickm
commit a0f892f19094efd963564cf788be887f694be796 Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:30:08 2015 -0400 Simplify the loop. --- src/or/main.c |9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index

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

2015-03-18 Thread translation
commit ca4eac1684706d034afaf0d8c9921e35ce54dcd7 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 13:45:45 2015 + Update translations for torbutton-torbuttonproperties --- fr/torbutton.properties |8 1 file changed, 4 insertions(+), 4 deletions(-)

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-18 Thread nickm
commit 9bdce9d4e5fd164b05e1ae87ab0f629d2cd38e42 Merge: d8263ac 77c671b Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:11:34 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.6] bump to 0.2.6.5-rc

2015-03-18 Thread nickm
commit 77c671b7dd1b0bc61e69b97ab41af51bec669285 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:10:48 2015 -0400 bump to 0.2.6.5-rc --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|2

[tor-commits] [tor/master] bump to 0.2.6.5-rc

2015-03-18 Thread nickm
commit 77c671b7dd1b0bc61e69b97ab41af51bec669285 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:10:48 2015 -0400 bump to 0.2.6.5-rc --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|2

[tor-commits] [tor/release-0.2.6] bump to 0.2.6.5-rc

2015-03-18 Thread nickm
commit 77c671b7dd1b0bc61e69b97ab41af51bec669285 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:10:48 2015 -0400 bump to 0.2.6.5-rc --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|2

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

2015-03-18 Thread translation
commit 8b2e0bb5a2996b6683eb45c029e8e999b9cc29f8 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 11:45:45 2015 + Update translations for torbutton-torbuttonproperties --- fr_CA/torbutton.properties |8 1 file changed, 4 insertions(+), 4

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

2015-03-18 Thread translation
commit 0e57c844076989e2600f702b74f4d4e08ff4b751 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 12:15:46 2015 + Update translations for torbutton-torbuttonproperties --- es/torbutton.properties|6 +++--- pt_BR/torbutton.properties |8 2

[tor-commits] [tor/release-0.2.6] remove a needless if (1) that was there for indentation; fix indentation.

2015-03-18 Thread nickm
commit 92d04721a2a614e40d6393ccc64ff2e86b71d778 Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:25:37 2015 -0400 remove a needless if (1) that was there for indentation; fix indentation. --- src/or/main.c | 76 - 1

[tor-commits] [tor/release-0.2.6] Fold everything into changelog, remove already-folded-in changes

2015-03-18 Thread nickm
commit 90a0a0ca7ae5495cf990d7694f11e4b454e5cf6e Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:07:52 2015 -0400 Fold everything into changelog, remove already-folded-in changes --- ChangeLog |4 changes/bug15240 |6 -- changes/bug15245

[tor-commits] [tor/release-0.2.6] Add comments for new functions

2015-03-18 Thread nickm
commit ddb1889eb8bc128ec0fca35f15b1bf90d2b629ac Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:27:33 2015 -0400 Add comments for new functions --- src/or/main.c |9 + 1 file changed, 9 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index

[tor-commits] [tor/release-0.2.6] Extract main part of main loop into a separate function

2015-03-18 Thread nickm
commit b78803f9f543c83bf50d0751eb160e80ed602eae Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 14:24:18 2015 -0400 Extract main part of main loop into a separate function For 15176; Shadow would like this. Based on a patch by Rob Jansen, but revised to have a

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6

2015-03-18 Thread nickm
commit bbf304be26b5d677bb08d91e8c41a4ba478a1f63 Merge: 91f7771 a0f892f Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:06:21 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6 changes/ticket15176 |3 ++ src/or/main.c | 105

[tor-commits] [tor/release-0.2.6] 0.2.6.5-rc will come out today, because why not.

2015-03-18 Thread nickm
commit eea90546f65b6629dd7fcc74df407de3fa839ced Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:09:08 2015 -0400 0.2.6.5-rc will come out today, because why not. --- ChangeLog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog

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

2015-03-18 Thread nickm
commit e0b77cd3194d705f9bca254f8a95e520070ca365 Merge: eea9054 77c671b Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 09:10:55 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2

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

2015-03-18 Thread translation
commit 1353f1862ac7475d1e645f7ff2bbf0af88c53505 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 13:15:45 2015 + Update translations for torbutton-torbuttonproperties --- es/torbutton.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

2015-03-18 Thread translation
commit 6bb41d999f167cd0c290810f0855a9261942495f Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 14:15:46 2015 + Update translations for torbutton-torbuttonproperties --- es/torbutton.properties |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

2015-03-18 Thread translation
commit 71933ba68a51721fbd4bd1a9fd10547a07261f16 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 16:15:47 2015 + Update translations for torbutton-torbuttonproperties --- de/torbutton.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

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

2015-03-18 Thread translation
commit 766ac4adbc076a8de7e98d60cba4a76f0fb4db97 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 15:45:44 2015 + Update translations for torbutton-torbuttonproperties --- es/torbutton.properties |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

[tor-commits] [arm/master] Rewrite GraphPanel's draw() method

2015-03-18 Thread atagar
commit fce787d6ff798dc826669dcbf810a14e9518f918 Author: Damian Johnson ata...@torproject.org Date: Wed Mar 18 09:15:32 2015 -0700 Rewrite GraphPanel's draw() method Few months ago I was amid a rewrite of our GraphPanel. Last section left was its draw() method which was a

[tor-commits] [tor/master] Clean up generated files.

2015-03-18 Thread nickm
commit 7a86d53deef573e110da9af35c9283349942c962 Author: cypherpunks cypherpu...@torproject.org Date: Wed Feb 25 16:04:02 2015 +0100 Clean up generated files. Remove src/or/or_sha1.i and src/common/common_sha1.i on `make clean` and remove the temporary micro-revision file when

[tor-commits] [arm/master] Thread safety for the graph panel

2015-03-18 Thread atagar
commit b46698efd09a1935aa71661bc0547bfcfe6cea3b Author: Damian Johnson ata...@torproject.org Date: Wed Mar 18 10:05:20 2015 -0700 Thread safety for the graph panel Similar pattern as the header panel. The draw method now makes a named tuple for the attributes it needs then

[tor-commits] [tor/master] Use output variables instead of relative paths.

2015-03-18 Thread nickm
commit 17cbc4350f1b840c7f4878808c9610f7a7936592 Author: cypherpunks cypherpu...@torproject.org Date: Tue Feb 17 15:36:10 2015 +0100 Use output variables instead of relative paths. Fixes the following rules in out-of-tree builds; - check-spaces - check-docs - check-logs

[tor-commits] [tor/master] Warn users trying to generate a coverage report when not configured as such.

2015-03-18 Thread nickm
commit 918ce27c31bedfb5554f1653b6dd6bbf346ca4a3 Author: cypherpunks cypherpu...@torproject.org Date: Thu Mar 5 15:48:47 2015 +0100 Warn users trying to generate a coverage report when not configured as such. --- Makefile.am |4 1 file changed, 4 insertions(+) diff --git

[tor-commits] [tor/master] Add changes file for 15053.

2015-03-18 Thread nickm
commit e656a88fad97a813f29f48a92ea9f972122bc3af Author: cypherpunks cypherpu...@torproject.org Date: Tue Mar 10 14:30:17 2015 +0100 Add changes file for 15053. --- changes/bug15053 |4 1 file changed, 4 insertions(+) diff --git a/changes/bug15053 b/changes/bug15053 new file mode

[tor-commits] [tor/master] Make `check-docs` work from out-of-tree builds.

2015-03-18 Thread nickm
commit eeb753e87115a7b19cc7de83c061fa5e599acb81 Author: cypherpunks cypherpu...@torproject.org Date: Wed Mar 11 10:47:13 2015 +0100 Make `check-docs` work from out-of-tree builds. --- Makefile.am |4 +- configure.ac|3 ++

[tor-commits] [tor/master] Remove relative paths to header files.

2015-03-18 Thread nickm
commit 5176f6f103f3b8b7e5c930c163d2926cf0da6f9b Author: cypherpunks cypherpu...@torproject.org Date: Fri Feb 27 15:24:21 2015 +0100 Remove relative paths to header files. The paths are already in the directory search path of the compiler therefore no need to include them in

[tor-commits] [tor/master] forward-port 0.2.6.5-rc changelog.

2015-03-18 Thread nickm
commit 6c26483e69add5b01fb2ff672856a4f4051f94c0 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 16:30:08 2015 -0400 forward-port 0.2.6.5-rc changelog. --- ChangeLog | 31 +++ 1 file changed, 31 insertions(+) diff --git a/ChangeLog b/ChangeLog

[tor-commits] [tor/release-0.2.6] bump to 0.2.6.5-rc.dev

2015-03-18 Thread nickm
commit ca03b10b0c39a02fd66824d04deccf40cbd66951 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 16:32:13 2015 -0400 bump to 0.2.6.5-rc.dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|

[tor-commits] [tor/master] bump to 0.2.6.5-rc.dev

2015-03-18 Thread nickm
commit ca03b10b0c39a02fd66824d04deccf40cbd66951 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 16:32:13 2015 -0400 bump to 0.2.6.5-rc.dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|

[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

2015-03-18 Thread nickm
commit 98c3942162831ddccea9dcf149d4c7f12b0a52a9 Merge: 6c26483 ca03b10 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 16:33:11 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' ___ tor-commits mailing list

[tor-commits] [tor/maint-0.2.6] bump to 0.2.6.5-rc.dev

2015-03-18 Thread nickm
commit ca03b10b0c39a02fd66824d04deccf40cbd66951 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 16:32:13 2015 -0400 bump to 0.2.6.5-rc.dev --- configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2 +- src/win32/orconfig.h|

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

2015-03-18 Thread nickm
commit d8b2b1168e7d30c7f6f4c32b496a0a3c6e22a213 Merge: e0b77cd ca03b10 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 16:32:26 2015 -0400 Merge branch 'maint-0.2.6' into release-0.2.6 configure.ac|2 +- contrib/win32build/tor-mingw.nsi.in |2

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

2015-03-18 Thread translation
commit 2d67c3874fffb1245aa76a4237e8cbaa8f83420e Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 07:15:02 2015 + Update translations for bridgedb --- sr/LC_MESSAGES/bridgedb.po |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git

[tor-commits] [translation/tor_animation_completed] pulling translations from transifex

2015-03-18 Thread translation
commit 92c4e1faa66f73c619b098205c88ad4cb2086811 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 22:56:47 2015 + pulling translations from transifex --- Tor_animation.srt | 165 ar.srt| 145

[tor-commits] [translation-tools/master] Added tor_animation and tor_animation_completed

2015-03-18 Thread colin
commit d429fa2381cf0fa024776d25f8bdfd4a557efd71 Author: Colin Childs co...@torproject.org Date: Wed Mar 18 17:43:16 2015 -0500 Added tor_animation and tor_animation_completed --- config |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config b/config index

[tor-commits] [tor/master] add newly generated files to .gitignore

2015-03-18 Thread nickm
commit 21fd94ddb81327a339a942fb5d134cb6ebb5a998 Author: Nick Mathewson ni...@torproject.org Date: Sat Mar 14 13:04:03 2015 -0400 add newly generated files to .gitignore --- .gitignore |4 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 0cdf2c4..b31a713

[tor-commits] [tor/master] Revive updateVersions.pl with `make update-versions`.

2015-03-18 Thread nickm
commit e85ba7459e6270b5ec1186a18e87a60c13153344 Author: cypherpunks cypherpu...@torproject.org Date: Thu Mar 12 09:28:41 2015 +0100 Revive updateVersions.pl with `make update-versions`. --- Makefile.am|4 +++ configure.ac |1 +

[tor-commits] [tor/master] Stop updating versions on every execution of `./configure`.

2015-03-18 Thread nickm
commit 45db963de4037a80b5993877886c0da60645180b Author: cypherpunks cypherpu...@torproject.org Date: Fri Feb 27 16:03:43 2015 +0100 Stop updating versions on every execution of `./configure`. --- configure.ac |4 1 file changed, 4 deletions(-) diff --git a/configure.ac

[tor-commits] [tor/master] Do not distribute common_sha1.i and or_sha1.i.

2015-03-18 Thread nickm
commit ce9bd4e04ce54b6b001c096f7caab2d0beaef941 Author: cypherpunks cypherpu...@torproject.org Date: Thu Mar 12 09:04:28 2015 +0100 Do not distribute common_sha1.i and or_sha1.i. These files get generated automatically so there is need to include them in the distribution. ---

[tor-commits] [tor/master] Merge remote-tracking branch 'public/feature15053'

2015-03-18 Thread nickm
commit 54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db Merge: 9bdce9d 21fd94d Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 14:27:00 2015 -0400 Merge remote-tracking branch 'public/feature15053' .gitignore |4 ++ Doxyfile.in |

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

2015-03-18 Thread translation
commit 3616e2ae371eccf8428aded4d506155a337396f6 Author: Translation commit bot translat...@torproject.org Date: Wed Mar 18 22:15:47 2015 + Update translations for torbutton-torbuttonproperties --- pl/torbutton.properties |8 1 file changed, 4 insertions(+), 4 deletions(-)

[tor-commits] [webwml/master] 0.2.6.5-rc is coming out.

2015-03-18 Thread nickm
commit bf549b3424479ba070c597d606e099d75458fe9a Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 18 16:05:09 2015 -0400 0.2.6.5-rc is coming out. --- Makefile |2 +- include/versions.wmi |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git

[tor-commits] [webwml/master] Let's see if that's better

2015-03-18 Thread sebastian
commit 15e665f550c3cbc3ca1586b4c9d27df50b17e73d Author: Sebastian Hahn sebast...@torproject.org Date: Wed Mar 18 22:11:40 2015 +0100 Let's see if that's better --- getinvolved/en/relays.wml |1 - 1 file changed, 1 deletion(-) diff --git a/getinvolved/en/relays.wml

[tor-commits] [webwml/master] Fix the relays page harder

2015-03-18 Thread sebastian
commit 0f80db6fb88f4e05d1619d6e6a3bf3d40add0737 Author: Sebastian Hahn sebast...@torproject.org Date: Wed Mar 18 22:19:06 2015 +0100 Fix the relays page harder --- getinvolved/en/relays.wml |2 ++ 1 file changed, 2 insertions(+) diff --git a/getinvolved/en/relays.wml

[tor-commits] [onionoo/master] Fix searches with multiple search terms.

2015-03-18 Thread karsten
commit ee394f9fed58e2b3e8afd85eab0019cd9e61cc24 Author: Karsten Loesing karsten.loes...@gmx.net Date: Mon Mar 16 09:29:17 2015 +0100 Fix searches with multiple search terms. Searches with multiple search terms were either broken in c13da0e or when switching from Tomcat to