aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-03-14Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4teor
2019-03-14Merge branch 'bug28096-029-squashed' into bug28096-034-squashedteor
2019-03-14Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9teor
2019-03-14Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9teor
2019-03-09test/sr: Free SRVs before replacing them in test_sr_setup_srv()teor
2019-03-08hs-v2: Copy needed information between service on prunningDavid Goulet
2019-03-08Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixesteor
2019-03-06Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2019-03-06Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-03-06Merge branch 'maint-0.2.9' into maint-0.3.3maint-0.3.3Nick Mathewson
2019-03-06Update geoip and geoip6 to the March 4 2019 database.Karsten Loesing
2019-03-01Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-03-01Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-03-01Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9teor
2019-03-01Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9teor
2019-03-01Bug 25733: Avoid assert failure if all circuits time out.Mike Perry
2019-02-28Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-02-28Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-02-28Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3teor
2019-02-28Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-02-28Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-02-28Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-02-27test/shared-random: use sr_state_free_all() rather than sr_state_free()teor
2019-02-27Merge branch 'bug29599_029' into bug29599_033teor
2019-02-27test/shared-random: Stop leaking shared random state in the unit teststeor
2019-02-27Merge branch 'maint-0.3.4' into release-0.3.4teor
2019-02-27Merge branch 'maint-0.3.3' into maint-0.3.4teor
2019-02-27Merge branch 'maint-0.2.9' into maint-0.3.3teor
2019-02-21Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2019-02-21Bump to 0.3.4.11-devNick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Bump to 0.3.3.12-devNick Mathewson
2019-02-210.3.4.11: copy changelog to releasenotestor-0.3.4.11Nick Mathewson
2019-02-21Add TROVE-2019-001 to changelog for 0.3.4.11Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2019-02-21kist: Don't write above the highwater outbuf markDavid Goulet
2019-02-21Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2019-02-21Bump to 0.3.4.11Nick Mathewson
2019-02-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2019-02-21Update to 0.3.3.12Nick Mathewson
2019-02-21Start a changelog for 0.3.4.11Nick Mathewson
2019-02-19Fix a compiler warning on OpenBSDKris Katterjohn