summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-09-24 11:25:39 -0400
committerNick Mathewson <nickm@torproject.org>2018-09-24 11:25:39 -0400
commit6b90972dc6c13a252368faf5aa8003a89495a96e (patch)
treecaa0c573729d3cb9309ba51a38daa16056078565 /doc
parent9767cf8cc091d0c9dd062fbfce258188841ec331 (diff)
parentd49133d9ca23a86a8fecb848022a16c006223721 (diff)
downloadtor-6b90972dc6c13a252368faf5aa8003a89495a96e.tar.gz
tor-6b90972dc6c13a252368faf5aa8003a89495a96e.zip
Merge branch 'pr_339_squashed'
Diffstat (limited to 'doc')
-rw-r--r--doc/HACKING/WritingTests.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md
index cc393494ec..05de8e0be8 100644
--- a/doc/HACKING/WritingTests.md
+++ b/doc/HACKING/WritingTests.md
@@ -7,8 +7,8 @@ keep from introducing bugs. The major ones are:
1. Unit tests written in C and shipped with the Tor distribution.
- 2. Integration tests written in Python and shipped with the Tor
- distribution.
+ 2. Integration tests written in Python 2 (>= 2.7) or Python 3
+ (>= 3.1) and shipped with the Tor distribution.
3. Integration tests written in Python and shipped with the Stem
library. Some of these use the Tor controller protocol.