summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-09-04Merge branch 'tor-github/pr/1288'David Goulet
2019-09-04Merge branch 'maint-0.4.1'David Goulet
2019-09-04Merge branch 'tor-github/pr/1271' into maint-0.4.1David Goulet
2019-09-04Merge branch 'tor-github/pr/1246'David Goulet
2019-09-04torerr: Fix a comment typo and update the comment for format_number_sigsafe()teor
2019-09-03Merge branch 'tor-github/pr/1269'George Kadianakis
2019-09-03Merge remote-tracking branch 'tor-github/pr/1279'Nick Mathewson
2019-09-02Merge remote-tracking branch 'tor-github/pr/1272'Nick Mathewson
2019-09-02Merge branch 'maint-0.4.1'Nick Mathewson
2019-09-02Merge branch 'ticket12399_035' into maint-0.4.1Nick Mathewson
2019-09-02Change loglevel of message 'Hash of session info was not as expected'rl1987
2019-09-02ChangeLog/ReleaseNotes: fix some incorrect bugfix versionsteor
2019-09-02ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entriesteor
2019-08-30Space out the arguments to the cell functions in rend_process_relay_cell()Neel Chauhan
2019-08-30Merge branch 'maint-0.4.1'teor
2019-08-30Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-08-30Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-08-30Merge remote-tracking branch 'tor-github/pr/1181' into maint-0.3.5teor
2019-08-30Merge remote-tracking branch 'tor-github/pr/1117' into maint-0.3.5teor
2019-08-30Merge remote-tracking branch 'tor-github/pr/1114' into maint-0.3.5teor
2019-08-29Merge branch 'tor-github/pr/1236'David Goulet
2019-08-29practracker: make filename terminology uniformNick Mathewson
2019-08-29scripts/git: fix shellcheck issues in git-push-all.shteor
2019-08-29scripts/git: fix an env var typo in git-merge-forward.shteor
2019-08-29Merge branch 'tor-github/pr/1257'David Goulet
2019-08-29Merge branch 'maint-0.4.1'David Goulet
2019-08-29Merge branch 'tor-github/pr/1256' into maint-0.4.1David Goulet
2019-08-29Merge branch 'tor-github/pr/1255' into maint-0.4.1David Goulet
2019-08-29scripts/git: Quote shell arguments where possibleteor
2019-08-29scripts/git: Improve usage documentation for merge-forward and push-allteor
2019-08-29scripts/git: Let git-push-all.sh skip unchanged test branchesteor
2019-08-29scripts/git: Make the git push command and args configurableteor
2019-08-29scripts/git: Allow git-merge-forward.sh to re-use existing test branchesteor
2019-08-29scripts/git: Add test branch support to the git scriptsteor
2019-08-29scripts/git: Cleanup and fix minor git scripts issuesteor
2019-08-29test: Change "make test-stem" so it only runs the stem tests that use torteor
2019-08-28test_confparse: verify that clearing a routerset sets it to NULL.Nick Mathewson
2019-08-28Document configuration type definition functions for routerset_tNick Mathewson
2019-08-28Routerset config parsing: represent empty sets as NULL.Nick Mathewson
2019-08-28Remove extraneous "n" from comment in routerset.cNick Mathewson
2019-08-27Merge branch 'maint-0.3.5' into maint-0.4.0George Kadianakis
2019-08-27Merge branch 'maint-0.4.0' into maint-0.4.1George Kadianakis
2019-08-27Merge branch 'maint-0.4.1'George Kadianakis
2019-08-27Merge branch 'tor-github/pr/1267'George Kadianakis
2019-08-27Merge remote-tracking branch 'arma/ticket31498'George Kadianakis
2019-08-27Merge branch 'tor-github/pr/1258'George Kadianakis
2019-08-27Merge branch 'tor-github/pr/1234'George Kadianakis
2019-08-27Merge branch 'tor-github/pr/1237'George Kadianakis
2019-08-26test_address: parenthesize macro arguments.Nick Mathewson
2019-08-26In tests, make sure that "ri" is freed on all paths.Nick Mathewson