 teor
|
4ca18fde93
Merge branch 'maint-0.3.5' into maint-0.4.0
|
5 vuotta sitten |
|
teor
|
dcb8cad4e6
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
|
5 vuotta sitten |
|
teor
|
a742a80eea
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
|
5 vuotta sitten |
|
teor
|
202ccc3930
Merge remote-tracking branch 'tor-github/pr/990' into maint-0.3.5
|
5 vuotta sitten |
|
teor
|
a58c4cc6dd
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.3.5
|
5 vuotta sitten |
|
teor
|
cb20054ccd
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
|
5 vuotta sitten |
|
teor
|
396134188f
Stop hard-coding env vars in the git scripts
|
5 vuotta sitten |
|
teor
|
973800b847
scripts/git: Stop hard-coding the bash path in the git scripts
|
5 vuotta sitten |
 Nick Mathewson
|
cfa943f140
Merge branch 'maint-0.4.1'
|
5 vuotta sitten |
|
Nick Mathewson
|
5b07ff4011
Merge branch 'maint-0.4.0' into maint-0.4.1
|
5 vuotta sitten |
|
Nick Mathewson
|
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
|
5 vuotta sitten |
|
Nick Mathewson
|
d6b411a351
Merge branch 'maint-0.4.1'
|
5 vuotta sitten |
|
Nick Mathewson
|
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
|
5 vuotta sitten |
|
Nick Mathewson
|
c8e09dd0d2
Merge branch 'maint-0.4.1'
|
5 vuotta sitten |
|
Nick Mathewson
|
c0285320df
Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1
|
5 vuotta sitten |
|
Nick Mathewson
|
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
|
5 vuotta sitten |
|
Nick Mathewson
|
1190636f24
Merge branch 'maint-0.4.1'
|
5 vuotta sitten |
|
Nick Mathewson
|
765e4364d9
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
|
5 vuotta sitten |
|
Nick Mathewson
|
0635170cf1
Add an environment variable to set GIT_PATH in git scripts
|
5 vuotta sitten |
|
Nick Mathewson
|
bbddda3a18
push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
|
5 vuotta sitten |
|
Nick Mathewson
|
46da530431
Update git scripts for new versions
|
5 vuotta sitten |
|
Nick Mathewson
|
adc7b50eae
Bump master to 0.4.2.0-alpha-dev
|
5 vuotta sitten |
|
teor
|
b9041e8a63
test: fix a typo in test_rebind.sh
|
5 vuotta sitten |
|
teor
|
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
|
5 vuotta sitten |
|
teor
|
be0a4be276
Travis: Skip test_rebind on macOS builds
|
5 vuotta sitten |
|
teor
|
d761c3ca6d
Travis: allow the test-stem job to fail
|
5 vuotta sitten |
|
Nick Mathewson
|
c46e99c43c
Tolerate net-unreachable failures in util/socketpair_ersatz
|
5 vuotta sitten |
|
Nick Mathewson
|
ecc5feff38
bump to 0.4.1.2-alpha-dev
|
5 vuotta sitten |
|
teor
|
6be9d3aed8
practracker: accept one extra line in routerlist.c
|
5 vuotta sitten |
|
teor
|
19bf5806ad
dirauth: Return a distinct status when formatting annotations fails
|
5 vuotta sitten |
