summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Upload to unstableHEADmasterPeter Palfrader2012-06-29
* Merge branch 'debian-merge' into debiandebian-obfsproxy-0.1.4-1Peter Palfrader2012-05-02
|\
| * New upstream versionPeter Palfrader2012-05-02
| * Merge commit 'obfsproxy-0.1.4' into debian-mergePeter Palfrader2012-05-02
| |\ |/ /
| * Do the release ritual for 0.1.4.obfsproxy-0.1.4George Kadianakis2012-05-02
| * Merge remote-tracking branch 'seb/bug5665'George Kadianakis2012-05-02
| |\
| | * Don't use compiler flags that break the buildSebastian Hahn2012-04-25
| * | Revert "Produce an error if pkg-config isn't found."George Kadianakis2012-05-01
| * | Revert "Produce an error if pkg-config's version is old."George Kadianakis2012-05-01
| * | Produce an error if pkg-config's version is old.George Kadianakis2012-04-26
| * | Produce an error if pkg-config isn't found.Rob Savoye2012-04-26
| |/
| * Merge branch 'bug5141'George Kadianakis2012-04-17
| |\
| | * Fix obfs2 argument parsing.George Kadianakis2012-04-11
| | * Indent obfs2 argument parsing.George Kadianakis2012-04-11
| * | Merge remote-tracking branch 'nickm/bug5141'George Kadianakis2012-04-17
| |\ \
| | * | Avoid segfault on resolve_address_port(NULL)Nick Mathewson2012-02-15
| * | | Merge branch 'bug5586'George Kadianakis2012-04-17
| |\ \ \
| | * | | Don't enable bufferevent reads/writes before connecting.George Kadianakis2012-04-09
| | | |/ | | |/|
| * | | Remove duplicate documentation.George Kadianakis2012-04-14
| * | | Disable safelogging in integration tests.George Kadianakis2012-04-13
| * | | Fix '--version' when called outside of a git repository.George Kadianakis2012-04-09
| |/ /
* | | Merge branch 'debian-merge' into debianPeter Palfrader2012-04-07
|\ \ \
| * | | New upstream versionPeter Palfrader2012-04-07
| * | | Merge commit 'obfsproxy-0.1.3' into debian-mergePeter Palfrader2012-04-07
| |\ \ \ |/ / / / | | _ / | | /
| * | Do the release ritual for 0.1.3.obfsproxy-0.1.3George Kadianakis2012-04-03
| * | Update changelog for #5156.obfsproxy-0.1.2George Kadianakis2012-03-28
| * | Don't poke connections or circuits after connect_hostname().George Kadianakis2012-03-19
| * | Don't set bufferevent callbacks before forming the circuit.George Kadianakis2012-03-19
| * | Move connection-building code around.George Kadianakis2012-03-19
| * | Trivial layout change in Changelog.George Kadianakis2012-03-19
| * | Implement --version and put git revision on top of log.George Kadianakis2012-03-19
| * | Implement 'make-version'.George Kadianakis2012-03-19
| * | Merge branch 'bug4921'George Kadianakis2012-03-19
| |\ \
| | * | Change an instance of 'malloc();snprintf();' to use 'obfs_asprintf()'.George Kadianakis2012-02-22
| | * | Add obfs_asprintf() unit tests.George Kadianakis2012-02-22
| | * | obfsproxify tor_asprintf() and friendsGeorge Kadianakis2012-02-22
| | * | Copy-paste tor.git:src/common/compat.c:tor_asprintf() in.George Kadianakis2012-02-22
| * | | Fix a name in LICENSE.George Kadianakis2012-03-11
* | | | debian/copyright: Mention http download location for upstream obfsproxy.Peter Palfrader2012-03-11
* | | | Up Standards-Versiondebian-obfsproxy-0.1.1-1Peter Palfrader2012-03-11
* | | | Update FSF's postal addressPeter Palfrader2012-03-11
* | | | Build-Depend on python (for tests)Peter Palfrader2012-03-11
* | | | Update copyright filePeter Palfrader2012-03-11
* | | | Merge branch 'debian-merge' into debianPeter Palfrader2012-03-11
|\ \ \ \
| * | | | Prepare initial releasePeter Palfrader2012-03-11
| * | | | Merge commit 'obfsproxy-0.1.1' into debian-mergePeter Palfrader2012-03-11
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | Do the release ritual for 0.1.1.obfsproxy-0.1.1George Kadianakis2012-03-09
| * | | Update changelog for #5131.George Kadianakis2012-03-09
| * | | add GPL license for m4 macrosJacob Appelbaum2012-03-09
| * | | basic AppArmor obfsproxy profileJacob Appelbaum2012-03-09