summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-04-09Merge branch 'tor-github/pr/915' into maint-0.4.0George Kadianakis
2019-04-09Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0teor
2019-04-09manpage: Clarify that Tor does stream isolation between *Port listeners by de...rl1987
2019-04-08Detect and suppress an additional gmtime() warning in test_util.cNick Mathewson
2019-04-06Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0teor
2019-04-06changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alphateor
2019-04-06NSS: disable TLS1.2 SHA-384 ciphersuites.Nick Mathewson
2019-04-06NSS: Log an error message when SSL_ExportKeyingMaterial() failsNick Mathewson
2019-04-06Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-04-06Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-04-06Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9teor
2019-04-06Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9teor
2019-04-05Merge branch 'tor-github/pr/906' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'tor-github/pr/901' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'tor-github/pr/879' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'tor-github/pr/902' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'tor-github/pr/800' into maint-0.4.0George Kadianakis
2019-04-05Merge branch 'bug29036-29962-034' into bug29036-29962-035teor
2019-04-05Merge branch 'bug29036-029' into bug29036-29962-034teor
2019-04-05Makefile: actually, don't delete the gcno filesteor
2019-04-05circuitpadding: comment fixesteor
2019-04-05test/circuitpadding: Delete circuitpadding_circuitsetup_machine()teor
2019-04-05Bug #29500: Fix monotime mocking in circpad unittests.Mike Perry
2019-04-05Changes file for bug 29500.Mike Perry
2019-04-05Bug 29500: Start monotime at 1000 nsec.Mike Perry
2019-04-05Bug 29500: Attempt to fix the tokens test.Mike Perry
2019-04-04Merge branch 'bug29959_040_squashed' into maint-0.4.0Nick Mathewson
2019-04-04bwauth: Actually include the bandwidth-file-digest in authority votesteor
2019-04-04Implement an DormantCanceledByStartup optionNick Mathewson
2019-04-04Merge branch 'bug30021_029' into bug30021_035Nick Mathewson
2019-04-04Do not cache bogus results from classifying client ciphersNick Mathewson
2019-04-04Merge branch 'bug30011_035' into bug30011_040teor
2019-04-04Travis: Terminate test-stem if it takes more than 9.5 minutes to runteor
2019-04-03Improve logging for 28614.Nick Mathewson
2019-04-03Merge branch 'tor-github/pr/867' into maint-0.4.0George Kadianakis
2019-04-03Merge branch 'tor-github/pr/811' into maint-0.4.0George Kadianakis
2019-04-03Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-04-03Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2019-04-03Merge branch 'maint-0.2.9' into maint-0.3.4Nick Mathewson
2019-04-03Update geoip and geoip6 to the April 2 2019 database.Karsten Loesing
2019-04-02Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-04-02Merge branch 'maint-0.3.4' into maint-0.3.5teor
2019-04-02Merge branch 'maint-0.2.9' into maint-0.3.4teor
2019-04-01Merge branch 'bug29036-29962-034' into bug29036-29962-035teor
2019-04-01Travis: merge before_cache from 29036 and 29962teor