Merge pull request #1391 from Bambooin/master
Update old repo url with new
diff --git a/c++/src/capnp/compiler/evolution-test.c++ b/c++/src/capnp/compiler/evolution-test.c++
index 48fe66b..964105a 100644
--- a/c++/src/capnp/compiler/evolution-test.c++
+++ b/c++/src/capnp/compiler/evolution-test.c++
@@ -872,7 +872,7 @@
}
kj::MainBuilder::Validity run() {
- // https://github.com/sandstorm-io/capnproto/issues/344 describes an obscure bug in the layout
+ // https://github.com/capnproto/capnproto/issues/344 describes an obscure bug in the layout
// algorithm, the fix for which breaks backwards-compatibility for any schema triggering the
// bug. In order to avoid silently breaking protocols, we are temporarily throwing an exception
// in cases where this bug would have occurred, so that people can decide what to do.
diff --git a/c++/src/capnp/compiler/node-translator.c++ b/c++/src/capnp/compiler/node-translator.c++
index d722738..a970ff3 100644
--- a/c++/src/capnp/compiler/node-translator.c++
+++ b/c++/src/capnp/compiler/node-translator.c++
@@ -433,7 +433,7 @@
// exception to alert developers of the problem.
//
// TODO(cleanup): Once sufficient time has elapsed, remove this assert.
- KJ_FAIL_ASSERT("Bad news: Cap'n Proto 0.5.x and previous contained a bug which would cause this schema to be compiled incorrectly. Please see: https://github.com/sandstorm-io/capnproto/issues/344");
+ KJ_FAIL_ASSERT("Bad news: Cap'n Proto 0.5.x and previous contained a bug which would cause this schema to be compiled incorrectly. Please see: https://github.com/capnproto/capnproto/issues/344");
}
lgSizeUsed = desiredUsage;
return true;
@@ -559,7 +559,7 @@
bool result = usage.tryExpand(
*this, location, oldLgSize, localOldOffset, expansionFactor);
if (mustFail && result) {
- KJ_FAIL_ASSERT("Bad news: Cap'n Proto 0.5.x and previous contained a bug which would cause this schema to be compiled incorrectly. Please see: https://github.com/sandstorm-io/capnproto/issues/344");
+ KJ_FAIL_ASSERT("Bad news: Cap'n Proto 0.5.x and previous contained a bug which would cause this schema to be compiled incorrectly. Please see: https://github.com/capnproto/capnproto/issues/344");
}
return result;
}
@@ -1370,7 +1370,7 @@
MemberInfo& member = *entry.second;
// Make sure the exceptions added relating to
- // https://github.com/sandstorm-io/capnproto/issues/344 identify the affected field.
+ // https://github.com/capnproto/capnproto/issues/344 identify the affected field.
KJ_CONTEXT(member.name);
if (member.declId.isOrdinal()) {
diff --git a/c++/src/kj/async-unix-test.c++ b/c++/src/kj/async-unix-test.c++
index c8012e4..b204644 100644
--- a/c++/src/kj/async-unix-test.c++
+++ b/c++/src/kj/async-unix-test.c++
@@ -100,7 +100,7 @@
//
// Also, this test fails on Linux on mipsel. si_value comes back as zero. No one with a mips
// machine wants to debug the problem but they demand a patch fixing it, so we disable the test.
- // Sad. https://github.com/sandstorm-io/capnproto/issues/204
+ // Sad. https://github.com/capnproto/capnproto/issues/204
captureSignals();
UnixEventPort port;
@@ -135,7 +135,7 @@
//
// Also, this test fails on Linux on mipsel. si_value comes back as zero. No one with a mips
// machine wants to debug the problem but they demand a patch fixing it, so we disable the test.
- // Sad. https://github.com/sandstorm-io/capnproto/issues/204
+ // Sad. https://github.com/capnproto/capnproto/issues/204
captureSignals();
UnixEventPort port;
@@ -489,7 +489,7 @@
}
#if !__APPLE__
-// Disabled on macOS due to https://github.com/sandstorm-io/capnproto/issues/374.
+// Disabled on macOS due to https://github.com/capnproto/capnproto/issues/374.
TEST(AsyncUnixTest, UrgentObserver) {
// Verify that FdObserver correctly detects availability of out-of-band data.
// Availability of out-of-band data is implementation-specific.
diff --git a/c++/src/kj/async-unix.h b/c++/src/kj/async-unix.h
index 63fe927..8e54f63 100644
--- a/c++/src/kj/async-unix.h
+++ b/c++/src/kj/async-unix.h
@@ -287,7 +287,7 @@
// has not yet resolved. If you do this, the previous promise may throw an exception.
//
// WARNING: This has some known weird behavior on macOS. See
- // https://github.com/sandstorm-io/capnproto/issues/374.
+ // https://github.com/capnproto/capnproto/issues/374.
Promise<void> whenWriteDisconnected();
// Resolves when poll() on the file descriptor reports POLLHUP or POLLERR.
diff --git a/doc/_includes/buttons.html b/doc/_includes/buttons.html
index 7a7ec75..66ec624 100644
--- a/doc/_includes/buttons.html
+++ b/doc/_includes/buttons.html
@@ -1,6 +1,6 @@
<div style="float: right">
<a class="github_link" style="color: #fff"
-href="https://github.com/sandstorm-io/capnproto">Develop</a>
+href="https://github.com/capnproto/capnproto">Develop</a>
<a class="groups_link" style="color: #fff"
href="https://groups.google.com/group/capnproto">Discuss</a>
<a class="groups_link" style="color: #fff"
diff --git a/doc/_includes/header.html b/doc/_includes/header.html
index f249d01..e835a3e 100644
--- a/doc/_includes/header.html
+++ b/doc/_includes/header.html
@@ -26,7 +26,7 @@
</div>
</header>
<a id="discuss_banner" href="https://groups.google.com/group/capnproto">Discuss on Groups</a>
- <a id="forkme_banner" href="https://github.com/sandstorm-io/capnproto">View on GitHub</a>
+ <a id="forkme_banner" href="https://github.com/capnproto/capnproto">View on GitHub</a>
</div>
{% if page.title != "Introduction" %}</a>{% endif %}
diff --git a/doc/_posts/2015-01-23-capnproto-0.5.1-bugfixes.md b/doc/_posts/2015-01-23-capnproto-0.5.1-bugfixes.md
index 345d756..52f1143 100644
--- a/doc/_posts/2015-01-23-capnproto-0.5.1-bugfixes.md
+++ b/doc/_posts/2015-01-23-capnproto-0.5.1-bugfixes.md
@@ -13,4 +13,4 @@
Sorry about the bugs.
-In other news, as you can see, the Cap'n Proto web site now lives at `capnproto.org`. Additionally, the Github repo has been moved to the [Sandstorm.io organization](https://github.com/sandstorm-io). Both moves have left behind redirects so that old links / repository references should continue to work.
+In other news, as you can see, the Cap'n Proto web site now lives at `capnproto.org`. Additionally, the Github repo has been moved to the [Sandstorm.io organization](https://github.com/capnproto). Both moves have left behind redirects so that old links / repository references should continue to work.
diff --git a/doc/_posts/2015-03-02-security-advisory-and-integer-overflow-protection.md b/doc/_posts/2015-03-02-security-advisory-and-integer-overflow-protection.md
index 1834524..eaa2b16 100644
--- a/doc/_posts/2015-03-02-security-advisory-and-integer-overflow-protection.md
+++ b/doc/_posts/2015-03-02-security-advisory-and-integer-overflow-protection.md
@@ -6,11 +6,11 @@
As the installation page has always stated, I do not yet recommend using Cap'n Proto's C++ library for handling possibly-malicious input, and will not recommend it until it undergoes a formal security review. That said, security is obviously a high priority for the project. The security of Cap'n Proto is in fact essential to the security of [Sandstorm.io](https://sandstorm.io), Cap'n Proto's parent project, in which sandboxed apps communicate with each other and the platform via Cap'n Proto RPC.
-A few days ago, the first major security bugs were found in Cap'n Proto C++ -- two by security guru [Ben Laurie](http://en.wikipedia.org/wiki/Ben_Laurie) and one by myself during subsequent review (see below). You can read details about each bug in our new [security advisories directory](https://github.com/sandstorm-io/capnproto/tree/master/security-advisories):
+A few days ago, the first major security bugs were found in Cap'n Proto C++ -- two by security guru [Ben Laurie](http://en.wikipedia.org/wiki/Ben_Laurie) and one by myself during subsequent review (see below). You can read details about each bug in our new [security advisories directory](https://github.com/capnproto/capnproto/tree/master/security-advisories):
-* [Integer overflow in pointer validation.](https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-0-c++-integer-overflow.md)
-* [Integer underflow in pointer validation.](https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-1-c++-integer-underflow.md)
-* [CPU usage amplification attack.](https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-2-all-cpu-amplification.md)
+* [Integer overflow in pointer validation.](https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-0-c++-integer-overflow.md)
+* [Integer underflow in pointer validation.](https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-1-c++-integer-underflow.md)
+* [CPU usage amplification attack.](https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-2-all-cpu-amplification.md)
I have backported the fixes to the last two release branches -- 0.5 and 0.4:
@@ -109,15 +109,15 @@
Moreover, because all of `Guarded`'s operators are inline and `constexpr`, a good optimizing compiler will be able to optimize `Guarded` down to the underlying primitive integer type. So, in theory, using `Guarded` has no runtime overhead. (I have not yet verified that real compilers get this right, but I suspect they do.)
-Of course, the full implementation is considerably more complicated than this. The code has not been merged into the Cap'n Proto tree yet as we need to do more analysis to make sure it has no negative impact. For now, you can find it in the [overflow-safe](https://github.com/sandstorm-io/capnproto/tree/overflow-safe) branch, specifically in the second half of [kj/units.h](https://github.com/sandstorm-io/capnproto/blob/overflow-safe/c++/src/kj/units.h). (This header also contains metaprogramming for compile-time unit analysis, which Cap'n Proto has been using since its first release.)
+Of course, the full implementation is considerably more complicated than this. The code has not been merged into the Cap'n Proto tree yet as we need to do more analysis to make sure it has no negative impact. For now, you can find it in the [overflow-safe](https://github.com/capnproto/capnproto/tree/overflow-safe) branch, specifically in the second half of [kj/units.h](https://github.com/capnproto/capnproto/blob/overflow-safe/c++/src/kj/units.h). (This header also contains metaprogramming for compile-time unit analysis, which Cap'n Proto has been using since its first release.)
### Results
I switched Cap'n Proto's core pointer validation code (`capnp/layout.c++`) over to `Guarded`. In the process, I found:
* Several overflows that could be triggered by the application calling methods with invalid parameters, but not by a remote attacker providing invalid message data. We will change the code to check these in the future, but they are not critical security problems.
-* The overflow that Ben had already reported ([2015-03-02-0](https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-0-c++-integer-overflow.md)). I had intentionally left this unfixed during my analysis to verify that `Guarded` would catch it.
-* One otherwise-undiscovered integer underflow ([2015-03-02-1](https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-1-c++-integer-underflow.md)).
+* The overflow that Ben had already reported ([2015-03-02-0](https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-0-c++-integer-overflow.md)). I had intentionally left this unfixed during my analysis to verify that `Guarded` would catch it.
+* One otherwise-undiscovered integer underflow ([2015-03-02-1](https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-1-c++-integer-underflow.md)).
Based on these results, I conclude that `Guarded` is in fact effective at finding overflow bugs, and that such bugs are thankfully _not_ endemic in Cap'n Proto's code.
diff --git a/doc/_posts/2015-03-05-another-cpu-amplification.md b/doc/_posts/2015-03-05-another-cpu-amplification.md
index d074c9d..4c8ae97 100644
--- a/doc/_posts/2015-03-05-another-cpu-amplification.md
+++ b/doc/_posts/2015-03-05-another-cpu-amplification.md
@@ -8,7 +8,7 @@
Fortunately, the incomplete fix is for the non-critical vulnerability. The worst case is that an attacker could consume excessive CPU time.
-Nevertheless, we've issued [a new advisory](https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-05-0-c++-addl-cpu-amplification.md) and pushed a new release:
+Nevertheless, we've issued [a new advisory](https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-05-0-c++-addl-cpu-amplification.md) and pushed a new release:
- Release 0.5.1.2: [source](https://capnproto.org/capnproto-c++-0.5.1.2.tar.gz), [win32](https://capnproto.org/capnproto-c++-win32-0.5.1.2.zip)
- Release 0.4.1.2: [source](https://capnproto.org/capnproto-c++-0.4.1.2.tar.gz)
diff --git a/doc/_posts/2017-05-01-capnproto-0.6-msvc-json-http-more.md b/doc/_posts/2017-05-01-capnproto-0.6-msvc-json-http-more.md
index bd36cbb..336f0d8 100644
--- a/doc/_posts/2017-05-01-capnproto-0.6-msvc-json-http-more.md
+++ b/doc/_posts/2017-05-01-capnproto-0.6-msvc-json-http-more.md
@@ -40,7 +40,7 @@
Cap'n Proto messages can now be converted to and from JSON using `libcapnp-json`. This makes it easy to integrate your JSON front-end API with your Cap'n Proto back-end.
-See the <code><a href="https://github.com/sandstorm-io/capnproto/blob/master/c++/src/capnp/compat/json.h">capnp/compat/json.h</a></code> header for API details.
+See the <code><a href="https://github.com/capnproto/capnproto/blob/master/c++/src/capnp/compat/json.h">capnp/compat/json.h</a></code> header for API details.
This library was primarily built by [**Kamal Marhubi**](https://github.com/kamalmarhubi) and [**Branislav Katreniak**](https://github.com/katreniak), using Cap'n Proto's [dynamic API]({{site.baseurl}}cxx.html#dynamic-reflection).
@@ -48,7 +48,7 @@
KJ (the C++ framework library bundled with Cap'n Proto) now ships with a minimalist HTTP library, `libkj-http`. The library is based on the KJ asynchronous I/O framework and covers both client-side and server-side use cases. Although functional and used in production today, the library should be considered a work in progress -- expect improvements in future releases, such as client connection pooling and TLS support.
-See the <code><a href="https://github.com/sandstorm-io/capnproto/blob/master/c++/src/kj/compat/http.h">kj/compat/http.h</a></code> header for API details.
+See the <code><a href="https://github.com/capnproto/capnproto/blob/master/c++/src/kj/compat/http.h">kj/compat/http.h</a></code> header for API details.
#### Smaller things
diff --git a/doc/cxxrpc.md b/doc/cxxrpc.md
index eb25acb..3e55bca 100644
--- a/doc/cxxrpc.md
+++ b/doc/cxxrpc.md
@@ -16,7 +16,7 @@
## Sample Code
-The [Calculator example](https://github.com/sandstorm-io/capnproto/tree/master/c++/samples) implements
+The [Calculator example](https://github.com/capnproto/capnproto/tree/master/c++/samples) implements
a fully-functional Cap'n Proto client and server.
## KJ Concurrency Framework
@@ -394,7 +394,7 @@
and an abstract Unix domain socket can be specified as `unix-abstract:` followed by an identifier.
For a more complete example, see the
-[calculator client sample](https://github.com/sandstorm-io/capnproto/tree/master/c++/samples/calculator-client.c++).
+[calculator client sample](https://github.com/capnproto/capnproto/tree/master/c++/samples/calculator-client.c++).
### Starting a server
@@ -434,7 +434,7 @@
an identifier.
For a more complete example, see the
-[calculator server sample](https://github.com/sandstorm-io/capnproto/tree/master/c++/samples/calculator-server.c++).
+[calculator server sample](https://github.com/capnproto/capnproto/tree/master/c++/samples/calculator-server.c++).
## Debugging
diff --git a/doc/encoding.md b/doc/encoding.md
index 5eeba8f..78a2032 100644
--- a/doc/encoding.md
+++ b/doc/encoding.md
@@ -268,7 +268,7 @@
C (32 bits) = Index of the capability in the message's capability
table.
-In [rpc.capnp](https://github.com/sandstorm-io/capnproto/blob/master/c++/src/capnp/rpc.capnp), the
+In [rpc.capnp](https://github.com/capnproto/capnproto/blob/master/c++/src/capnp/rpc.capnp), the
capability table is encoded as a list of `CapDescriptors`, appearing along-side the message content
in the `Payload` struct. However, some use cases may call for different approaches. A message
that is built and consumed within the same process need not encode the capability table at all
@@ -415,7 +415,7 @@
the original message size; however, most applications should place limits on overall message sizes
anyway, so it makes sense to have one check cover both.
-**List amplification:** A list of `Void` values or zero-size structs can have a very large element count while taking constant space on the wire. If the receiving application expects a list of structs, it will see these zero-sized elements as valid structs set to their default values. If it iterates through the list processing each element, it could spend a large amount of CPU time or other resources despite the message being small. To defend against this, the "traversal limit" should count a list of zero-sized elements as if each element were one word instead. This rule was introduced in the C++ implementation in [commit 1048706](https://github.com/sandstorm-io/capnproto/commit/104870608fde3c698483fdef6b97f093fc15685d).
+**List amplification:** A list of `Void` values or zero-size structs can have a very large element count while taking constant space on the wire. If the receiving application expects a list of structs, it will see these zero-sized elements as valid structs set to their default values. If it iterates through the list processing each element, it could spend a large amount of CPU time or other resources despite the message being small. To defend against this, the "traversal limit" should count a list of zero-sized elements as if each element were one word instead. This rule was introduced in the C++ implementation in [commit 1048706](https://github.com/capnproto/capnproto/commit/104870608fde3c698483fdef6b97f093fc15685d).
### Stack overflow DoS attack
diff --git a/doc/install.md b/doc/install.md
index e9da66a..3777c50 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -84,7 +84,7 @@
[automake](http://www.gnu.org/software/automake/), and
[libtool](http://www.gnu.org/software/libtool/) -- installed.
- git clone https://github.com/sandstorm-io/capnproto.git
+ git clone https://github.com/capnproto/capnproto.git
cd capnproto/c++
autoreconf -i
./configure
diff --git a/doc/otherlang.md b/doc/otherlang.md
index e306492..38524f3 100644
--- a/doc/otherlang.md
+++ b/doc/otherlang.md
@@ -72,7 +72,7 @@
Plugins are independent executables (written in any language) which read a description of the
schema from standard input and then generate the necessary code. The description is itself a
Cap'n Proto message, defined by
-[schema.capnp](https://github.com/sandstorm-io/capnproto/blob/master/c%2B%2B/src/capnp/schema.capnp).
+[schema.capnp](https://github.com/capnproto/capnproto/blob/master/c%2B%2B/src/capnp/schema.capnp).
Specifically, the plugin receives a `CodeGeneratorRequest`, using
[standard serialization](encoding.html#serialization-over-a-stream)
(not packed). (Note that installing the C++ runtime causes schema.capnp to be placed in
@@ -100,8 +100,8 @@
as the working directory, so you do not need to worry about this.
For examples of plugins, take a look at
-[capnpc-capnp](https://github.com/sandstorm-io/capnproto/blob/master/c%2B%2B/src/capnp/compiler/capnpc-capnp.c%2B%2B)
-or [capnpc-c++](https://github.com/sandstorm-io/capnproto/blob/master/c%2B%2B/src/capnp/compiler/capnpc-c%2B%2B.c%2B%2B).
+[capnpc-capnp](https://github.com/capnproto/capnproto/blob/master/c%2B%2B/src/capnp/compiler/capnpc-capnp.c%2B%2B)
+or [capnpc-c++](https://github.com/capnproto/capnproto/blob/master/c%2B%2B/src/capnp/compiler/capnpc-c%2B%2B.c%2B%2B).
### Supporting Dynamic Languages
diff --git a/doc/rpc.md b/doc/rpc.md
index 1c6dcd8..9ef2a49 100644
--- a/doc/rpc.md
+++ b/doc/rpc.md
@@ -142,7 +142,7 @@
#### Example code
-[The calculator example](https://github.com/sandstorm-io/capnproto/blob/master/c++/samples/calculator-client.c++)
+[The calculator example](https://github.com/capnproto/capnproto/blob/master/c++/samples/calculator-client.c++)
uses promise pipelining. Take a look at the client side in particular.
### Distributed Objects
@@ -244,7 +244,7 @@
The Cap'n Proto RPC protocol is defined in terms of Cap'n Proto serialization schemas. The
documentation is inline. See
-[rpc.capnp](https://github.com/sandstorm-io/capnproto/blob/master/c++/src/capnp/rpc.capnp).
+[rpc.capnp](https://github.com/capnproto/capnproto/blob/master/c++/src/capnp/rpc.capnp).
Cap'n Proto's RPC protocol is based heavily on
[CapTP](http://www.erights.org/elib/distrib/captp/index.html), the distributed capability protocol
diff --git a/security-advisories/2015-03-02-0-c++-integer-overflow.md b/security-advisories/2015-03-02-0-c++-integer-overflow.md
index d25b2a1..300647e 100644
--- a/security-advisories/2015-03-02-0-c++-integer-overflow.md
+++ b/security-advisories/2015-03-02-0-c++-integer-overflow.md
@@ -35,7 +35,7 @@
- Unix: https://capnproto.org/capnproto-c++-0.4.1.1.tar.gz
- release 0.6 (future)
-[0]: https://github.com/sandstorm-io/capnproto/commit/f343f0dbd0a2e87f17cd74f14186ed73e3fbdbfa
+[0]: https://github.com/capnproto/capnproto/commit/f343f0dbd0a2e87f17cd74f14186ed73e3fbdbfa
Details
=======
@@ -97,6 +97,6 @@
I am pleased that measures 1, 2, and 3 all detected this bug, suggesting that
they have a high probability of catching any similar bugs.
-[1]: https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-0-all-cpu-amplification.md
-[2]: https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-1-c++-integer-underflow.md
+[1]: https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-0-all-cpu-amplification.md
+[2]: https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-1-c++-integer-underflow.md
[3]: https://capnproto.org/news/2015-03-02-security-advisory-and-integer-overflow-protection.html
diff --git a/security-advisories/2015-03-02-1-c++-integer-underflow.md b/security-advisories/2015-03-02-1-c++-integer-underflow.md
index 970f8b9..06a3cd2 100644
--- a/security-advisories/2015-03-02-1-c++-integer-underflow.md
+++ b/security-advisories/2015-03-02-1-c++-integer-underflow.md
@@ -37,7 +37,7 @@
- Unix: https://capnproto.org/capnproto-c++-0.4.1.1.tar.gz
- release 0.6 (future)
-[0]: https://github.com/sandstorm-io/capnproto/commit/26bcceda72372211063d62aab7e45665faa83633
+[0]: https://github.com/capnproto/capnproto/commit/26bcceda72372211063d62aab7e45665faa83633
Details
=======
@@ -106,5 +106,5 @@
This problem is also caught by capnp/fuzz-test.c++, which *has* been
merged into master but likely doesn't have as broad coverage.
-[1]: https://github.com/sandstorm-io/capnproto/tree/master/security-advisories/2015-03-02-0-c++-integer-overflow.md
+[1]: https://github.com/capnproto/capnproto/tree/master/security-advisories/2015-03-02-0-c++-integer-overflow.md
[2]: https://capnproto.org/news/2015-03-02-security-advisory-and-integer-overflow-protection.html
diff --git a/security-advisories/2015-03-02-2-all-cpu-amplification.md b/security-advisories/2015-03-02-2-all-cpu-amplification.md
index 94ad336..1bc4bcc 100644
--- a/security-advisories/2015-03-02-2-all-cpu-amplification.md
+++ b/security-advisories/2015-03-02-2-all-cpu-amplification.md
@@ -35,7 +35,7 @@
- Unix: https://capnproto.org/capnproto-c++-0.4.1.1.tar.gz
- release 0.6 (future)
-[0]: https://github.com/sandstorm-io/capnproto/commit/104870608fde3c698483fdef6b97f093fc15685d
+[0]: https://github.com/capnproto/capnproto/commit/104870608fde3c698483fdef6b97f093fc15685d
Details
=======
diff --git a/security-advisories/2015-03-05-0-c++-addl-cpu-amplification.md b/security-advisories/2015-03-05-0-c++-addl-cpu-amplification.md
index aee7f17..bd25698 100644
--- a/security-advisories/2015-03-05-0-c++-addl-cpu-amplification.md
+++ b/security-advisories/2015-03-05-0-c++-addl-cpu-amplification.md
@@ -37,7 +37,7 @@
- Unix: https://capnproto.org/capnproto-c++-0.4.1.2.tar.gz
- release 0.6 (future)
-[0]: https://github.com/sandstorm-io/capnproto/commit/80149744bdafa3ad4eedc83f8ab675e27baee868
+[0]: https://github.com/capnproto/capnproto/commit/80149744bdafa3ad4eedc83f8ab675e27baee868
Details
=======
@@ -55,7 +55,7 @@
consumed, not RAM or other resources. However, it is still possible to create
significant delays for the receiver with a specially-crafted message.
-[1]: https://github.com/sandstorm-io/capnproto/blob/master/security-advisories/2015-03-02-2-all-cpu-amplification.md
+[1]: https://github.com/capnproto/capnproto/blob/master/security-advisories/2015-03-02-2-all-cpu-amplification.md
Preventative measures
=====================
diff --git a/security-advisories/2017-04-17-0-apple-clang-elides-bounds-check.md b/security-advisories/2017-04-17-0-apple-clang-elides-bounds-check.md
index 683b8e3..49221fc 100644
--- a/security-advisories/2017-04-17-0-apple-clang-elides-bounds-check.md
+++ b/security-advisories/2017-04-17-0-apple-clang-elides-bounds-check.md
@@ -42,7 +42,7 @@
- Windows: https://capnproto.org/capnproto-c++-win32-0.5.3.1.zip
- release 0.6 (future)
-[0]: https://github.com/sandstorm-io/capnproto/commit/52bc956459a5e83d7c31be95763ff6399e064ae4
+[0]: https://github.com/capnproto/capnproto/commit/52bc956459a5e83d7c31be95763ff6399e064ae4
Details
=======
@@ -144,4 +144,4 @@
extensive refactoring, it is not appropriate for cherry-picking, and will
only land in versions 0.6 and up.
-[2]: https://github.com/sandstorm-io/capnproto/commit/2ca8e41140ebc618b8fb314b393b0a507568cf21
+[2]: https://github.com/capnproto/capnproto/commit/2ca8e41140ebc618b8fb314b393b0a507568cf21
diff --git a/style-guide.md b/style-guide.md
index ec73dc4..828db18 100644
--- a/style-guide.md
+++ b/style-guide.md
@@ -429,7 +429,7 @@
* Clang for compiling.
* `KJ_DBG()` for simple debugging.
* Valgrind for complicated debugging.
-* [Ekam](https://github.com/sandstorm-io/ekam) for a build system.
+* [Ekam](https://github.com/capnproto/ekam) for a build system.
* Git for version control.
## Irrelevant formatting rules