summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Add changes file for <30min HeartbeatPeriod patchticket28840Matt Traudt2018-12-14
* allow any value for HearbeatPeriod in testing Tor networksRob Jansen2018-12-14
* Merge branch 'maint-0.3.5'Nick Mathewson2018-12-13
|\
| * Merge remote-tracking branch 'tlyu-github/ticket28731-035' into maint-0.3.5Nick Mathewson2018-12-13
| |\
| | * Log bootstrap tag namesTaylor Yu2018-12-10
* | | Merge branch 'dormant_persist_squashed'Nick Mathewson2018-12-13
|\ \ \
| * | | Unit tests for back-end functions for persistent dormant stateNick Mathewson2018-12-13
| * | | Change interaction between dormant mode and clock jumps.Nick Mathewson2018-12-13
| * | | changes file for ticket26864Nick Mathewson2018-12-13
| * | | Add an option to start tor in dormant mode for the first time.Nick Mathewson2018-12-04
| * | | Remember in our state file how long we've spent since user activityNick Mathewson2018-12-04
* | | | Merge branch 'maint-0.3.5'Nick Mathewson2018-12-13
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'teor/bug28826-035' into maint-0.3.5Nick Mathewson2018-12-13
| |\ \ \
| | * | | Appveyor: Explain appveyor image names in the commentsteor2018-12-12
* | | | | man: Add that "GETINFO address" won't work with "Sandbox 1"David Goulet2018-12-12
* | | | | Merge branch 'ticket28755_v2_squashed'Nick Mathewson2018-12-12
|\ \ \ \ \
| * | | | | Copy the nss-related changes into fuzzing_include_am.py.Nick Mathewson2018-12-12
| * | | | | Fuzzing module for various string operations, currently focusing onNick Mathewson2018-12-12
| * | | | | Add code to parse K=V lines into config_line_t format.Nick Mathewson2018-12-12
* | | | | | Merge remote-tracking branch 'teor/ticket24838'Nick Mathewson2018-12-11
|\ \ \ \ \ \
| * | | | | | Fallbacks: accept relays that are a fuzzy match to the whitelistteor2018-12-07
| * | | | | | Fallbacks: refactor is_in_whitelist() to take an exact match booleanteor2018-12-07
| * | | | | | Fallbacks: Rename CONSENSUS_EXPIRY_TOLERANCE to REASONABLY_LIVE_TIMEteor2018-12-07
| * | | | | | Fallbacks: use a 24 hour future consensus toleranceteor2018-12-07
| * | | | | | Fallbacks: use a 24 hour consensus expiry toleranceteor2018-12-07
| * | | | | | Fallbacks: minor script comment changesteor2018-12-07
| |/ / / / /
* | | | | | Merge branch 'maint-0.3.5'Nick Mathewson2018-12-11
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson2018-12-11
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-12-11
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson2018-12-11
| | | |\ \ \ \ \
| | | | * | | | | Note ticket number in changes file for 24803Nick Mathewson2018-12-11
* | | | | | | | | Merge remote-tracking branch 'github/prop297'Nick Mathewson2018-12-11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | No longer exit for missing required protocolversions on an old consensusNick Mathewson2018-11-24
| * | | | | | | | | Rewrite updateVersions script in Python, add datestamp functionality.Nick Mathewson2018-11-24
* | | | | | | | | | Merge branch 'maint-0.3.5'Nick Mathewson2018-12-11
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson2018-12-11
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson2018-12-11
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson2018-12-11
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Fallbacks: Update the hard-coded fallback list in December 2018teor2018-12-10
| | | | * | | | | Fallbacks: Update the hard-coded fallback list in December 2018teor2018-12-07
* | | | | | | | | Merge remote-tracking branch 'teor/24805-phoul'Nick Mathewson2018-12-11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Changes file for 24805teor2018-12-07
| * | | | | | | | | Add CrackerboxPalace fallbackColin Childs2018-11-21
| * | | | | | | | | Remove mullbinde9 from fallback listColin Childs2018-10-15
| * | | | | | | | | Adding hviv104 to fallback listColin Childs2018-10-15
| * | | | | | | | | Adding Quake to fallback listColin Childs2018-10-12
| * | | | | | | | | Remove aurora and chulak from fallback listColin Childs2018-10-12
| * | | | | | | | | Adding fallback relayColin Childs2018-09-20
| * | | | | | | | | Adjusting IP of fallbackColin Childs2018-09-19
| * | | | | | | | | Adding 1 new fallbackColin Childs2018-09-12