summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* build: Add pretty printing of results of rust autoconf checks.bug24612Isis Lovecruft2017-12-13
* Merge branch 'maint-0.3.2'Nick Mathewson2017-12-12
|\
| * Make sandbox.c compile when libseccomp-dev is installed on arm64Nick Mathewson2017-12-12
* | Merge branch 'maint-0.3.2'Nick Mathewson2017-12-12
|\ \ | |/
| * Merge branch 'bug24367_032_squashed' into maint-0.3.2Nick Mathewson2017-12-12
| |\
| | * Make sure bridges are definitely running before delaying directory fetchesteor2017-12-12
| | * Simplify some conditionals in circuit_get_open_circ_or_launch()teor2017-12-12
| | * Run the download_status_increment test in a forked process.Nick Mathewson2017-12-11
| | * Avoid crashing if we call num_usable_bridges() when bridges are not enabledteor2017-11-22
| | * Stop checking cached bridge descriptors for usable bridgesteor2017-11-22
* | | Merge branch 'maint-0.3.2'Nick Mathewson2017-12-12
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'dgoulet/bug24595_032_02' into maint-0.3.2Nick Mathewson2017-12-12
| |\ \
| | * | hs-v3: Don't lookup an intro point while cleaning it upGeorge Kadianakis2017-12-12
* | | | Merge remote-tracking branch 'teor/bug23827-v2'Nick Mathewson2017-12-12
|\ \ \ \
| * | | | fixup! Stop waiting for microdescs if the consensus supports IPv6 ORPortsteor2017-12-11
| * | | | fixup! Add networkstatus_consensus_has_ipv6() and unit teststeor2017-12-11
| * | | | Stop waiting for microdescs if the consensus supports IPv6 ORPortsteor2017-12-11
| * | | | Add networkstatus_consensus_has_ipv6() and unit teststeor2017-12-11
* | | | | Fix compilation: logfile_is_external() must accept const*Nick Mathewson2017-12-12
* | | | | Merge remote-tracking branch 'ahf-oniongit/bugs/24362'Nick Mathewson2017-12-12
|\ \ \ \ \
| * | | | | Simplify explicit conditional checks into an inlined function.Alexander Færøy2017-12-12
| * | | | | Add support for Android's logging subsystem.Alexander Færøy2017-12-11
| * | | | | Restructure log initilization function to allow multiple backends without arg...Alexander Færøy2017-12-11
| |/ / / /
* | | | | Merge remote-tracking branch 'teor/log24558'Nick Mathewson2017-12-12
|\ \ \ \ \
| * | | | | Make configure log messages less confusing during static buildsteor2017-12-12
* | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-12-12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-12-12
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-12-12
| | |\ \ \ \ \
| | | * | | | | rename changes fileNick Mathewson2017-12-12
* | | | | | | | Merge remote-tracking branch 'teor/doc24596'Nick Mathewson2017-12-12
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a typo in CodingStandards.mdteor2017-12-12
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'maint-0.3.2'Nick Mathewson2017-12-11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-12-11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | |
| | * | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-12-11
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-11
| | | |\ \ \
| | | | * \ \ Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-12-11
| | | | |\ \ \
| | | | | * \ \ Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-12-11
| | | | | |\ \ \
| | | | | | * \ \ Merge branch 'bug24167_025' into maint-0.2.5Nick Mathewson2017-12-11
| | | | | | |\ \ \
* | | | | | | \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-12-11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-12-11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-12-11
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-11
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-12-11
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-12-11
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5Nick Mathewson2017-12-11
| | | | | | |\ \ \ \
* | | | | | | \ \ \ \ Merge branch 'maint-0.3.2'Nick Mathewson2017-12-11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson2017-12-11
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-12-11
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-12-11
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9Nick Mathewson2017-12-11
| | | | |\ \ \ \ \ \ \