summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-09-07Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-09-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-09-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-09-07Update geoip and geoip6 to the September 6 2016 database.Karsten Loesing
2016-08-24Changes file for bifroestNick Mathewson
2016-08-24Replace Tonga with Bifroest.Isis Lovecruft
* FIXES #19728: https://bugs.torproject.org/19728 * CLOSES #19690: https://bugs.torproject.org/19690
2016-08-12Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-08-12Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-08-12Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-08-12Update geoip and geoip6 to the August 2 2016 database.Karsten Loesing
2016-07-19Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-07-19Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-07-19Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-07-18Update geoip and geoip6 to the July 6 2016 database.Karsten Loesing
2016-07-05Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-07-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-07-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-07-05whoops. changelog file for 19271.Nick Mathewson
2016-07-05Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-07-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-07-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-07-03Remove urras as a default trusted directory authoritySebastian Hahn
It had been a directory authority since 0.2.1.20.
2016-06-13Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-06-13Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-06-13Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-06-12Update geoip and geoip6 to the June 7 2016 database.Karsten Loesing
2016-06-02Use tor_sscanf, not sscanf, in test_util.c.Nick Mathewson
Fixes the 0.2.7 case of bug #19213, which prevented mingw64 from working.
2016-05-12Merge branch 'bug18977_026_v2' into maint-0.2.7Nick Mathewson
2016-05-12Merge branch 'bug18977_024_v2' into bug18977_026_v2Nick Mathewson
Had conflicts related to other correct_tm bugs in 0.2.6. Added wday for another case.
2016-05-12Have correct_tm set tm_wday as well.Nick Mathewson
The tm_wday field had been left uninitialized, which was causing some assertions to fail on Windows unit tests. Fixes bug 18977.
2016-05-11unbreak the build (when warnings are enabled)Roger Dingledine
2016-05-11Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7Nick Mathewson
2016-05-11Fix out-of-bounds write during voting with duplicate ed25519 keysJohn Brooks
In dirserv_compute_performance_thresholds, we allocate arrays based on the length of 'routers', a list of routerinfo_t, but loop over the nodelist. The 'routers' list may be shorter when relays were filtered by routers_make_ed_keys_unique, leading to an out-of-bounds write on directory authorities. This bug was originally introduced in 26e89742, but it doesn't look possible to trigger until routers_make_ed_keys_unique was introduced in 13a31e72. Fixes bug 19032; bugfix on tor 0.2.8.2-alpha.
2016-05-11Merge branch 'bug18841_1_025' into maint-0.2.7Nick Mathewson
2016-05-11Undefine _FORTIFY_SOURCE before defining it.Nick Mathewson
This makes our compilation options checks in autoconf work better on systems that already define _FORTIFY_SOURCE. Fixes at least one case of bug 18841; bugfix on 0.2.3.17-beta. Patch from "trudokal".
2016-05-09Merge branch 'bug19008_027' into maint-0.2.7Nick Mathewson
2016-05-09Add "-c 1" to ping6 in test-network-allNick Mathewson
Fixes bug 19008. bugfix on 0.2.7.3-rc
2016-05-09Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-05-09Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-05-09Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-05-09Update geoip and geoip6 to the May 4 2016 database.Karsten Loesing
2016-04-12Do not link tests against both libor.a and libor-testing.aNick Mathewson
Also, put libor-testing.a at a better position in the list of libraries, to avoid linker errors. This is a fix, or part of a fix, for 18490. Conflicts: src/test/include.am
2016-04-07Merge branch 'maint-0.2.6' into maint-0.2.7Nick Mathewson
2016-04-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2016-04-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2016-04-07Update geoip and geoip6 to the April 5 2016 database.Karsten Loesing
2016-03-30Merge branch 'bug15221_027' into maint-0.2.7Andrea Shepard
2016-03-29Merge branch 'bug18570_027' into maint-0.2.7Andrea Shepard
2016-03-29Merge branch 'bug16248_027' into maint-0.2.7Andrea Shepard
2016-03-21Merge branch 'ed25519_voting_fixes_squashed' into maint-0.2.7Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion