summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-07-07Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-07-07Merge branch 'bug22838_028' into maint-0.2.8Nick Mathewson
2017-07-07mingw fix: avoid "unused var" warning.Nick Mathewson
2017-07-07Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-07Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-07-07Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-07-07Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-07-07Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-07-07Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-07-07Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-07-07Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-07-07Mention TROVE-2017-007 in changes file for 22789Nick Mathewson
2017-07-07Use the correct TROVE id for #22753.Nick Mathewson
2017-07-06Merge remote-tracking branch 'public/bug19648'Nick Mathewson
2017-07-06Merge remote-tracking branch 'chelseakomlo/coding-standards-22762'Nick Mathewson
2017-07-06Merge branch 'bug20488_029_squashed'Nick Mathewson
2017-07-06Improve warning message to stop implying nickname reg is a thing.Nick Mathewson
2017-07-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-05Fix a wide line from 22207Nick Mathewson
2017-07-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-05Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1Nick Mathewson
2017-07-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-07-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-05Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-07-05Only disable -Wfloat-conversion on mingw when it exists.Nick Mathewson
2017-07-05Make the strings from #1667 static.Nick Mathewson
2017-07-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-05Fix mixed-sign comparison warning in fix for 22797.Nick Mathewson
2017-07-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-07-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-05Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-07-05Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-07-05Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-07-05Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-07-05Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-07-05Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-07-05Merge branch 'bug22789_024' into maint-0.2.4Nick Mathewson
2017-07-05Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-07-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-05Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-07-05Merge branch 'bug22801_028' into maint-0.2.9Nick Mathewson
2017-07-05Merge branch 'maint-0.3.1'Nick Mathewson
2017-07-05Merge branch 'teor-bug22797-025' into maint-0.3.1Nick Mathewson
2017-07-05Always allow extra file descriptors when setting the connection maximumteor
2017-07-05Merge branch 'neena-fix-1667'Nick Mathewson
2017-07-05Extract "not an HTTP proxy" messages.Nick Mathewson
2017-07-05Merge branch 'bug15554_032_01_squashed'Nick Mathewson
2017-07-05changes file for 15554Nick Mathewson
2017-07-05Add test that parses a hardcoded v2 descriptor.George Kadianakis
2017-07-05Merge branch 'onionskin_refactor_2'Nick Mathewson