summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-07-12forward-port older changelogstor-0.3.3.9Roger Dingledine
(it looks like release-0.3.2 is missing a bunch of changelog stanzas. oh well. maybe we can just let that branch quietly go obsolete in october.)
2018-07-12bump to 0.3.3.9 for releaseRoger Dingledine
2018-07-12fold changes into 0.3.3.9Roger Dingledine
2018-07-12Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-12Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-07-12Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-07-12put new bridge auth Serge into placeRoger Dingledine
The "Bifroest" bridge authority has been retired; the new bridge authority is "Serge", and it is operated by George from the TorBSD project. Closes ticket 26771.
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Bump to 0.3.3.8-dev.Nick Mathewson
2018-07-09Build a changelog and releasenotes for 0.3.3.8tor-0.3.3.8Nick Mathewson
2018-07-09Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Merge remote-tracking branch 'github/bug26269_031' into maint-0.3.2Nick Mathewson
2018-07-09Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-07-09Merge branch 'bug26269_029' into maint-0.2.9Nick Mathewson
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Bump to 0.3.3.8Nick Mathewson
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Clear all control.c flags on control_free_all()Nick Mathewson
Fixes bug 25512. (Cherry-picked from 3519d0c8086ede
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Merge remote-tracking branch 'catalyst-github/bug26455_033' into maint-0.3.3Nick Mathewson
2018-07-09Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-07-09Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-09Merge remote-tracking branch 'mikeperry/bug25705_v3_033' into maint-0.3.3Nick Mathewson
2018-07-06Update geoip and geoip6 to the July 3 2018 database.Karsten Loesing
2018-07-03Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-07-03Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-03Merge branch 'maint-0.3.2' into maint-0.3.3Nick 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-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-01Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-07-01Merge remote-tracking branch 'dgoulet/bug26523_033_01' 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.3.3' into release-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick 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-29Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2018-06-29Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-06-29Merge branch 'maint-0.2.9' into maint-0.3.1Nick 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.3' into release-0.3.3Nick Mathewson