summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-13Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge branch 'bug22895_027' into maint-0.2.9Nick Mathewson
2017-11-13Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-11-13Merge branch 'bug23291_028' into maint-0.2.8Nick Mathewson
2017-11-13hs-v3: Fix consensus param "hsdir-interval" nameDavid Goulet
The dir-spec.txt specifies it to be "hsdir_interval" (underscore). Fixes #24262 Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-13Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9Nick Mathewson
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-13Merge branch 'bug8185_025' into maint-0.2.9Nick Mathewson
2017-11-13Merge branch 'bug8185_031' into maint-0.3.1Nick Mathewson
2017-11-13Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-13Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-13Merge branch 'ticket21953_029' into maint-0.2.9Nick Mathewson
2017-11-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-11-11Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-11-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-11-11Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-11-10Update geoip and geoip6 to the November 6 2017 database.Karsten Loesing
2017-10-31Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-10-31Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-10-31Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9Nick Mathewson
2017-10-25Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump
2017-10-25Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
"ours" merge to avoid version bump
2017-10-25Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
"ours" merge to avoid version bump
2017-10-25Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
"ours" merge to avoid version bump
2017-10-25bump to 0.3.1.8-devNick Mathewson
2017-10-25bump to 0.3.0.12-devNick Mathewson
2017-10-25bump to 0.2.9.13-devNick Mathewson
2017-10-25bump to 0.2.8.16-devNick Mathewson
2017-10-25bump to 0.2.5.15-devNick Mathewson
2017-10-24Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump
2017-10-24Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
"ours" merge to avoid version bump
2017-10-24bump version in the other places :/Nick Mathewson
2017-10-24bump version in the other places :/Nick Mathewson
2017-10-24Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
"ours" merge to avoid version bump
2017-10-24Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
"ours" merge to avoid version bump
2017-10-24Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
"ours" merge to avoid version bump
2017-10-24Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
"ours" merge to avoid version bump
2017-10-24bump to 0.3.1.8Nick Mathewson
2017-10-24bump to 0.3.0.12Nick Mathewson
2017-10-24bump to 0.2.9.13Nick Mathewson
2017-10-24bump to 0.2.8.16Nick Mathewson
2017-10-24bump to 0.2.5.15Nick Mathewson
2017-10-23Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-10-23Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion