Punting bidwatcher for bug # 140630

2 files changed, 51 insertions, 0 deletions

diff --git a/net-misc/tor/Manifest b/net-misc/tor/Manifest
index 91bf296ae5a5..c41507ac1c4c 100644
--- a/net-misc/tor/Manifest
+++ b/net-misc/tor/Manifest
@@ -19,6 +19,18 @@ RMD160 e97a4f007390bba5f4836bd11eee80b59e30a748 files/torrc.sample-0.1.0.14.patc
 SHA256 27c6a20633c453287df583ddd7922c65ae98335f9c850d0fb6b965b1038faeba files/torrc.sample-0.1.0.14.patch 1120
 AUX torrc.sample-0.1.0.16.patch 1134 RMD160 ad432e115b9610e139315f3908f4622702b84f7a SHA1 8b3f02b07c43e56ddce3b14f7a084329b332f793 SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da
 MD5 ab82c91feb4f7eceb4d1ed496a17f928 files/torrc.sample-0.1.0.16.patch 1134
+<<<<<<< Manifest
+<<<<<<< Manifest
+RMD160 ad432e115b9610e139315f3908f4622702b84f7a files/torrc.sample-0.1.0.16.patch 1134
+SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da files/torrc.sample-0.1.0.16.patch 1134
+DIST tor-0.1.0.14.tar.gz 631723 RMD160 c9e0728c123b5f4f0131528f6cde9de473153be6 SHA256 a42b97161f05fd8a3625ab1748a2a9eb05eada1bf15b9282a64c56a1d28983c6 size 631723
+DIST tor-0.1.0.16.tar.gz 633340 RMD160 f932433aa3687d5366d10f60315bf4e580a020b4 SHA1 567fd02d5d22c571c452bc354f1c902cfb37d3f4 SHA256 5d95cc3299f302398a41cbfb3d10265e3561c8a871e217158c7cbf05c4b3478a size 633340
+DIST tor-0.1.0.17.tar.gz 634144 RMD160 d3b99e1f1ea26d73dae073ee62d3a1899905074a SHA256 33dc70a8d8f4ad20a9c9b8d476d431c713d8d94f1859b3efbaf1e178b36c2ca3 size 634144
+EBUILD tor-0.1.0.14-r1.ebuild 1283 RMD160 12c66c3e05cb594ed85db4b9d194541a3d9b9601 SHA1 ad81f74a06cd33d4b9076a62985bacd6acae418f SHA256 12cacea1a5611174b0de1e43ee1d5fee044fc1fc3d40321fea2a7c465451d575 size 1283
+=======
+MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
+>>>>>>> 1.105
+=======
 RMD160 ad432e115b9610e139315f3908f4622702b84f7a files/torrc.sample-0.1.0.16.patch 1134
 SHA256 3174ef12c8d15486b9bd872a72030367023e0f81639659ecb48204160705d6da files/torrc.sample-0.1.0.16.patch 1134
 AUX torrc.sample-0.1.1.23.patch 1138 RMD160 33c67ce315a5e41be4e68fe3bb76ca39121e5929 SHA1 760b35aca8e55010603ea8d4177706144b42e09a SHA256 df93f901e5c0d19da37fc9b5f2a8651451338851221c390d1e4961ab1f6c2226
@@ -32,6 +44,7 @@ DIST tor-0.1.1.20.tar.gz 828833 RMD160 5d48d2954931fb28f0039f2472245abc9896316c
 DIST tor-0.1.1.22.tar.gz 841296 RMD160 db9d81225d2cecda9c3faa94f7eb9ed23ba40335 SHA1 44409da83e896154b83178bec971074e14b6dbb0 SHA256 cb15f152ccc1f939a7c0eac42411090f339e33b30563d16e0de7d3f3b84ce011
 DIST tor-0.1.1.23.tar.gz 847906 RMD160 e958ed22f44e5f06736cadb5406dad04510a69f5 SHA1 d3f0120f5a18658231127281343aafb6c06aed70 SHA256 a2ac0b10089902c2de8649e07823dc46b8876cd3e0236505e5e7f1f49ee11025
 EBUILD tor-0.1.0.14-r1.ebuild 1283 RMD160 12c66c3e05cb594ed85db4b9d194541a3d9b9601 SHA1 ad81f74a06cd33d4b9076a62985bacd6acae418f SHA256 12cacea1a5611174b0de1e43ee1d5fee044fc1fc3d40321fea2a7c465451d575
+>>>>>>> 1.106
 MD5 2933c0659d5fd3a5b8a79681e573cfa0 tor-0.1.0.14-r1.ebuild 1283
 RMD160 12c66c3e05cb594ed85db4b9d194541a3d9b9601 tor-0.1.0.14-r1.ebuild 1283
 SHA256 12cacea1a5611174b0de1e43ee1d5fee044fc1fc3d40321fea2a7c465451d575 tor-0.1.0.14-r1.ebuild 1283
@@ -41,6 +54,38 @@ RMD160 6c7d07e08fbae4b7df5123ecac08dfb398b860f9 tor-0.1.0.16.ebuild 4071
 SHA256 1c85d2781ce3e8d306f0d36bfdc430c81dabe4af6bc772f3e7dbc1fbbcec8ce0 tor-0.1.0.16.ebuild 4071
 EBUILD tor-0.1.0.17.ebuild 4071 RMD160 5b8dd36b3abe275dd38e33d41b682d20f177b5e1 SHA1 26225cf5ed9aa41f76d3a3d10072c4cebb315f3b SHA256 b42d217484bd9bd368a0e4cd075f2d705d7cba6f5e4e4e4dc11aae369de69ed0
 MD5 bd342387478972c66e5aaa774c0f479e tor-0.1.0.17.ebuild 4071
+<<<<<<< Manifest
+<<<<<<< Manifest
+RMD160 5b8dd36b3abe275dd38e33d41b682d20f177b5e1 tor-0.1.0.17.ebuild 4071
+SHA256 b42d217484bd9bd368a0e4cd075f2d705d7cba6f5e4e4e4dc11aae369de69ed0 tor-0.1.0.17.ebuild 4071
+MISC ChangeLog 8681 RMD160 c6df87e2881512036a7e85932f7ee3a14f755218 SHA1 7e7447282cac5e98d37a5ecb7b79febc5d6866bf SHA256 af965b44e77727f5f9525e86396076c83863347a94e9d102f249b9efd791634e size 8681
+MD5 8726445c831f84ec008974f72fa39d18 ChangeLog 8681
+RMD160 c6df87e2881512036a7e85932f7ee3a14f755218 ChangeLog 8681
+SHA256 af965b44e77727f5f9525e86396076c83863347a94e9d102f249b9efd791634e ChangeLog 8681
+MISC metadata.xml 224 RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 SHA1 76b617d1cccc3a09fc6995f19e800d99775064c7 SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6 size 224
+MD5 b79b08e0f979feb256c93295714b4fc9 metadata.xml 224
+RMD160 87e0a44a0ea05af5ad562f03d35b841c42c48971 metadata.xml 224
+SHA256 5a95452656188e381651219d143d53498f11199a52ade7ed467a94e001e72bd6 metadata.xml 224
+MD5 f1a1fe76e7869a462d16c17a99b2b7ed files/digest-tor-0.1.0.14-r1 238
+RMD160 566c668ec862b1325ef917bec431d6526a040492 files/digest-tor-0.1.0.14-r1 238
+SHA256 d066a6d28e9d91a244a29f73fac9ecd1301ad6ae0b6fdd91a5b1466e1f154c40 files/digest-tor-0.1.0.14-r1 238
+MD5 a32d4444318e63fd9d2f4805e8b55e2c files/digest-tor-0.1.0.16 238
+RMD160 0bba7f8d4946096dbc60ac84486251ab507571fd files/digest-tor-0.1.0.16 238
+SHA256 c65cbe8d6d599d804e8f90a05ac18b026254645b1d5ed8b634ecdb74fd28437a files/digest-tor-0.1.0.16 238
+MD5 2e626d3d0276e7f9149faf58bbc9d821 files/digest-tor-0.1.0.17 238
+RMD160 c4b4c7d265ff9db7666a82f57bedcdcb198502ba files/digest-tor-0.1.0.17 238
+SHA256 8e4641954dc5e2e53a22565e87496a49c7efa1687b88206fc82988c2ee394d3b files/digest-tor-0.1.0.17 238
+=======
+MD5 b8051faba0570d76e0d4ea9f3092f151 tor-0.1.1.20.ebuild 1295
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFEf0vgKRy60XGEcJIRAvDQAKCLvA2eDE1/CH4EhEZT5sQyVeYB+ACfRYCD
+vP2vmTlukA0U0xi6LbicI9E=
+=v/Qj
+-----END PGP SIGNATURE-----
+>>>>>>> 1.105
+=======
 RMD160 5b8dd36b3abe275dd38e33d41b682d20f177b5e1 tor-0.1.0.17.ebuild 4071
 SHA256 b42d217484bd9bd368a0e4cd075f2d705d7cba6f5e4e4e4dc11aae369de69ed0 tor-0.1.0.17.ebuild 4071
 EBUILD tor-0.1.1.20.ebuild 1291 RMD160 660275cf71229c094f0f7554803b071260f9ab70 SHA1 b8ab6b8dfc16e6ac4d6d8d00c8bdc5e74263662e SHA256 d3a3ff851d53c2533bd93b7aa24802537c8490edcff7b6ab011783e6c9f3b47e
@@ -75,6 +120,9 @@ SHA256 8e4641954dc5e2e53a22565e87496a49c7efa1687b88206fc82988c2ee394d3b files/di
 MD5 3da01d426b0c73fc172cd02bb898f399 files/digest-tor-0.1.1.20 238
 RMD160 1b7ef397f0fef11bdbecf43d81a0476b7810407a files/digest-tor-0.1.1.20 238
 SHA256 d0a7e086a2314cb9a86a0795d747c3182a3ec1027a3839c1729aef5bfdae5d09 files/digest-tor-0.1.1.20 238
+<<<<<<< Manifest
+>>>>>>> 1.106
+=======
 MD5 fb046c5c5aabaacbeae6ef9d7d7ef599 files/digest-tor-0.1.1.22 238
 RMD160 b24a11378ec15e5d148f34b33fdcca0f816895ae files/digest-tor-0.1.1.22 238
 SHA256 f1b174508a7c00fd54bbae228356872d4eee632345bcf67c144fd6b4dd2b302b files/digest-tor-0.1.1.22 238
@@ -88,3 +136,4 @@ iD8DBQFE7PLi8zY1VwezZiERAmiUAJwIaF5kWnD3CH5K4Q3nd64pl8zw9gCeJyXD
 W9WIaNrY/MtJ8YIs9XQS0j4=
 =gNCv
 -----END PGP SIGNATURE-----
+>>>>>>> 1.108
diff --git a/net-misc/tor/files/digest-tor-0.1.0.16 b/net-misc/tor/files/digest-tor-0.1.0.16
index 1d50918eec49..b6aad944248d 100644
--- a/net-misc/tor/files/digest-tor-0.1.0.16
+++ b/net-misc/tor/files/digest-tor-0.1.0.16
@@ -1 +1,3 @@
 MD5 13631507b8eeee5d6e8fd245dc3eef4f tor-0.1.0.16.tar.gz 633340
+RMD160 f932433aa3687d5366d10f60315bf4e580a020b4 tor-0.1.0.16.tar.gz 633340
+SHA256 5d95cc3299f302398a41cbfb3d10265e3561c8a871e217158c7cbf05c4b3478a tor-0.1.0.16.tar.gz 633340