summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-07-03Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-07-03Merge branch 'bug26535_032' into maint-0.3.2Nick Mathewson
2018-07-03Merge branch 'bug26535_029' into maint-0.2.9Nick Mathewson
2018-07-02Partially revert "Use tor_addr_from_getsockname() in several places"Nick Mathewson
This reverts part of commit 6ed384b827dce21ea3a44b587, in order to fix bug 26568. Bugfix on 0.3.4.1-alpha.
2018-07-02hs_ntor_ref.py: pass only strings to subprocess.PopenNick Mathewson
Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug copied from ntor_ref.py on 0.3.1.1-alpha.
2018-07-02ntor_ref.py: pass only strings to subprocess.PopenNick Mathewson
Recent Python3 versions seem to require this on Windows. Fixes bug 26535; bug introduced in f4be34f70d6f277a0f3f73e, which was apparently intended itself as a Python3 workaround.
2018-07-02Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-07-02Merge remote-tracking branch 'catalyst-github/bug26449_034' into maint-0.3.4Nick Mathewson
2018-07-02Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-07-02Merge branch 'mikeperry_bug26214-rebased_squashed' into maint-0.3.4Nick Mathewson
2018-07-01Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-07-01Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-07-01Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3Nick Mathewson
2018-06-30Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-06-30Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into ↵Nick Mathewson
maint-0.3.4
2018-06-29Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.2.9' into maint-0.3.1maint-0.3.1Nick Mathewson
2018-06-29Finally remove our EOL@EOF check.Nick Mathewson
This check was added by mistake long ago. It will be nice to see these EOLs disappear from our code over time. (backport from master)
2018-06-29Restor EOL@EOF in routerlist.cNick Mathewson
2018-06-29Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-06-29Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-06-29Fix a memory error in test_shared_randomNick Mathewson
Bug not in any released Tor.
2018-06-29Fix some memory errors in the recent coverity fixes.Nick Mathewson
Found by asan on travis :/
2018-06-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-06-29Merge remote-tracking branch 'ahf-github/maint-0.3.2' into maint-0.3.2Nick Mathewson
2018-06-29Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-06-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-29Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1Nick Mathewson
2018-06-29Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1Nick Mathewson
2018-06-29Changes file for 26467Nick Mathewson
2018-06-29Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-06-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-29Merge branch 'maint-0.2.9' into maint-0.3.1Nick Mathewson
2018-06-29Merge remote-tracking branch 'ahf-github/maint-0.2.9' into maint-0.2.9Nick Mathewson
2018-06-27Fix Rust cross compilation.Alex Xu (Hello71)
2018-06-27control: Make HSPOST properly parse HSADDRESS= paramDavid Goulet
For HSv3, the HSADDRESS= wasn't properly parsed for the HSPOST command. It now correctly use it and furthermore sends back a "200 OK" in case the command is successful for a v3 descriptor. Fixes #26523 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-06-26Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion