aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-16 08:34:23 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-16 08:34:23 -0400
commit91d999e17e0f6787bead391cbe03c0beda069656 (patch)
tree5a396335c2bccdc953d0bda49bb2c976a86b6ff7
parent8683c5653244d8ae58b9a569594f14534b31216a (diff)
parentdb3414dd518d757e9a1c9be6c7987fee54f51cf7 (diff)
downloadtor-91d999e17e0f6787bead391cbe03c0beda069656.tar.gz
tor-91d999e17e0f6787bead391cbe03c0beda069656.zip
Merge branch 'maint-0.3.2' into release-0.3.2
-rw-r--r--doc/HACKING/GettingStartedRust.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/HACKING/GettingStartedRust.md b/doc/HACKING/GettingStartedRust.md
index a5253b46a6..920596cadf 100644
--- a/doc/HACKING/GettingStartedRust.md
+++ b/doc/HACKING/GettingStartedRust.md
@@ -119,9 +119,10 @@ the module calls. Modules which call fewer other modules are better targets.
Strive to change the C API as little as possible.
-We are currently targetting Rust nightly, *for now*. We expect this to change
-moving forward, as we understand more about which nightly features we need. It
-is on our TODO list to try to cultivate good standing with various distro
+We are currently targetting Rust stable. (See CodingStandardsRust.md for more
+details.)
+
+It is on our TODO list to try to cultivate good standing with various distro
maintainers of `rustc` and `cargo`, in order to ensure that whatever version we
solidify on is readily available.