Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
"ours" merge to avoid MR 122 -- we already merged MR 123.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Previously it just used /usr/bin/env/python, which would fail if we
only had a "python3" binary.
Fixes bug 40095; bugfix on 0.4.4.1-alpha.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This is based on @eighthave's templates, and the work we've been
doing to present a uniform testing environment.
|
|
Eventually this should be used by every one of our CI scripts.
|
|
|
|
|
|
|
|
|
|
Fixes conflicts due to code movement.
|
|
This fixes bug 40083, which was introduced in 9f31908a in
0.2.8.1-alpha.
|
|
Resolves conflicts:
src/core/or/channel.c
src/test/test_channel.c
|