 Nick Mathewson
|
c8447f95ec
Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
|
6 years ago |
|
Nick Mathewson
|
d6b411a351
Merge branch 'maint-0.4.1'
|
6 years ago |
|
Nick Mathewson
|
6a72cc2598
Merge branch 'maint-0.4.0' into maint-0.4.1
|
6 years ago |
|
Nick Mathewson
|
c8e09dd0d2
Merge branch 'maint-0.4.1'
|
6 years ago |
|
Nick Mathewson
|
c0285320df
Merge remote-tracking branch 'tor-github/pr/1097' into maint-0.4.1
|
6 years ago |
|
Nick Mathewson
|
df8e2bbc0f
Merge remote-tracking branch 'tor-github/pr/1038'
|
6 years ago |
|
Nick Mathewson
|
1190636f24
Merge branch 'maint-0.4.1'
|
6 years ago |
|
Nick Mathewson
|
765e4364d9
Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
|
6 years ago |
|
Nick Mathewson
|
0635170cf1
Add an environment variable to set GIT_PATH in git scripts
|
6 years ago |
|
Nick Mathewson
|
bbddda3a18
push-all: Use TOR_UPSTREAM_REMOTE_NAME to override UPSTREAM_BRANCH
|
6 years ago |
|
Nick Mathewson
|
46da530431
Update git scripts for new versions
|
6 years ago |
|
Nick Mathewson
|
adc7b50eae
Bump master to 0.4.2.0-alpha-dev
|
6 years ago |
 teor
|
b9041e8a63
test: fix a typo in test_rebind.sh
|
6 years ago |
|
teor
|
430dd2da6e
Merge branch 'bug30713_035' into bug30713_040
|
6 years ago |
|
teor
|
be0a4be276
Travis: Skip test_rebind on macOS builds
|
6 years ago |
|
teor
|
d761c3ca6d
Travis: allow the test-stem job to fail
|
6 years ago |
|
Nick Mathewson
|
ecc5feff38
bump to 0.4.1.2-alpha-dev
|
6 years ago |
|
teor
|
b07b1a4f6d
practracker: accept 3 extra lines in router_parse_entry_from_string()
|
6 years ago |
|
teor
|
c7fc53c2e7
Merge branch 'bug30781_040' into bug30781_master
|
6 years ago |
|
teor
|
fb3f461406
Merge branch 'bug30781_035' into bug30781_040
|
6 years ago |
|
teor
|
c8c2e2b8fc
Merge branch 'bug30781_034' into bug30781_035
|
6 years ago |
|
teor
|
dc8e3cd5ce
Merge branch 'bug30781_029' into bug30781_034
|
6 years ago |
|
teor
|
ba83c1e5cf
dirparse: Stop crashing when parsing unknown descriptor purpose annotations
|
6 years ago |
|
Nick Mathewson
|
3c2b2f072f
Merge branch 'maint-0.4.0'
|
6 years ago |
|
Nick Mathewson
|
6a6f7eb671
Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
|
6 years ago |
|
Nick Mathewson
|
d63c17f2af
Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
|
6 years ago |
|
Nick Mathewson
|
e51b57ee04
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
|
6 years ago |
|
Nick Mathewson
|
04cb2d4010
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0
|
6 years ago |
|
Nick Mathewson
|
2300a619a5
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
|
6 years ago |
|
Nick Mathewson
|
851e881f01
Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
|
6 years ago |
