summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-12-12Simplify some conditionals in circuit_get_open_circ_or_launch()teor
2017-12-12Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-12Merge remote-tracking branch 'dgoulet/bug24595_032_02' into maint-0.3.2Nick Mathewson
2017-12-12hs-v3: Don't lookup an intro point while cleaning it upGeorge Kadianakis
2017-12-12Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-12Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-12Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-12rename changes fileNick Mathewson
2017-12-11Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-12-11Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-11Merge branch 'bug24167_025' into maint-0.2.5Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-11Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'bug24086_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-11Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1Nick Mathewson
2017-12-11Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-11Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0Nick Mathewson
2017-12-11Merge branch 'stack_fixes_032_v2' into maint-0.3.2Nick Mathewson
2017-12-11Add a changelog for the STACK fixesNick Mathewson
2017-12-11Move subtraction in rephist to try to avoid STACK warningNick Mathewson
2017-12-11Stop checking for sandbox:new_element() failures: it can't fail.Nick Mathewson
2017-12-11transport_new() cannot fail; do not check for it to fail.Nick Mathewson
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11sched: Avoid integer overflow when computing tcp_spaceDavid Goulet
2017-12-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-11Merge remote-tracking branch 'dgoulet/bug23603_032_02' into maint-0.3.2Nick Mathewson
2017-12-11Run the download_status_increment test in a forked process.Nick Mathewson
2017-12-07Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson