summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* routerkeys: Add cmdline option for learning signing key expiration.bug17639_r1Isis Lovecruft2017-08-03
* Merge branch 'bug20152'Nick Mathewson2017-08-03
|\
| * Changes suggested by teor.Nick Mathewson2017-08-03
| * Try to improve documentation for DirAuthority's port field.Nick Mathewson2017-07-05
* | Merge branch 'bug22885_squashed'Nick Mathewson2017-08-03
|\ \
| * | Don't send missing X-Desc-Gen-Reason on startupNick Mathewson2017-08-03
* | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-03
|\ \ \
| * \ \ Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-03
| |\ \ \
| | * \ \ Merge remote-tracking branch 'dgoulet/bug23078_030_01' into maint-0.3.0Nick Mathewson2017-08-03
| | |\ \ \
| | | * | | hs: Cleanup logging statement in hs_intropoint.cDavid Goulet2017-08-01
* | | | | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-03
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'bug23081_025' into maint-0.3.1Nick Mathewson2017-08-03
| |\ \ \ \ \
| | * | | | | In ntmain, call set_main_thread() before running the loop.Nick Mathewson2017-08-03
* | | | | | | add changes file for STRUCT_OFFSET removeal (22521)Nick Mathewson2017-08-03
* | | | | | | Switch to offsetof()Neel Chauhan2017-08-03
* | | | | | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-03
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-03
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-08-03
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson2017-08-03
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson2017-08-03
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Update geoip and geoip6 to the August 3 2017 database.Karsten Loesing2017-08-03
* | | | | | | | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-02
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'bug23071_031' into maint-0.3.1Nick Mathewson2017-08-02
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Make the hs_ntor_ref logic more correct when there is no sha3 moduleNick Mathewson2017-08-02
| | * | | | | | | | Fix the hs_ntor integration tests to work with the pysha3 moduleNick Mathewson2017-07-31
* | | | | | | | | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-02
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-02
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | version bump to 0.3.0.10-devNick Mathewson2017-08-02
* | | | | | | | | | Forward-port 0.3.0.10 changelogNick Mathewson2017-08-02
* | | | | | | | | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-01
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-01
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Bump to 0.3.0.10Nick Mathewson2017-08-01
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | forward-port 0.3.1.5-alpha changelogNick Mathewson2017-08-01
* | | | | | | | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-01
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | bump to 0.3.1.5-alpha-devNick Mathewson2017-08-01
* | | | | | | | | Remove one more changes file for item already in release-0.3.1Nick Mathewson2017-08-01
* | | | | | | | | Merge branch 'maint-0.3.1'Nick Mathewson2017-08-01
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-01
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-08-01
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge remote-tracking branch 'public/bug19769_19025_029' into maint-0.2.9Nick Mathewson2017-08-01
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ Merge branch 'maint-0.3.1'Nick Mathewson2017-08-01
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-01
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-08-01
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge remote-tracking branch 'public/bug20059_024_v2' into maint-0.2.9Nick Mathewson2017-08-01
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ Merge branch 'maint-0.3.1'Nick Mathewson2017-08-01
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-01
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0Nick Mathewson2017-08-01
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge branch 'maint-0.3.1'Nick Mathewson2017-08-01
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson2017-08-01
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson2017-08-01
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |