Quack~ zoonderkins

Git refusing to merge unrelated histories on rebase

Error: fatal: refusing to merge unrelated histories

Solution:

Rebase it git pull --rebase branchname
pull git pull origin branchname --allow-unrelated-histories
push git push origin master

Introduction

So HAProxy is primalery a load balancer an proxy for TCP and HTTP. But it may act as a traffic regulator. It may also be used as a protection against DDoS and service abuse, by maintening a wide variety of statistics (IP, URL, cookie) and when abuse is happening, action as denying, redirecting to other backend may undertaken ([haproxy ddos config], [haproxy ddos])

Install I2P
- Download I2P
- java -jar i2pinstall_*.jar
Install Java Service Wrapper
- Download Community Version
- tar xzf wrapper-*.tar.gz
- cp wrapper*/bin/wrapper /Applications/i2p/i2psvc
- cp wrapper*/lib/wrapper.jar /Applications/i2p/lib
- cp wrapper*/lib/libwrapper.so /Applications/i2p/lib
Try to start I2P using /Applications/i2p/i2prouter start or Start I2P Router app

新闻w

RHEL 7 发布应该算是比较大的新闻了吧~

人民群众纷纷表示红帽步子太大不要扯着蛋了比较好...

F_XZ: 完全没关心...

猫注意的新功能有 virtio 等 KVM 优化, docker 支持, 以及 ruby 2.0, python 2.7, java 7 之类的吧

SSL 设计目标:

防内容篡改
防冒充服务器身份
加密通信内容

而翻墙的目标:

不被检测出客户端在访问什么网站
不被检测出服务器在提供翻墙服务

DNS.md

A list of reasonably reliable DNS servers that I've personally tested to ensure that they fully support DNSSEC and do not hijack NXDOMAIN responses.

^{*: The servers in this list were last tested November 13, 2017.
I make no guarantee that they will continue to function in a reliable and
compliant manner in the future.}

	//
	// _oo0oo_
	// o8888888o
	// 88" . "88
	// (\| -_- \|)
	// 0\ = /0
	// ___/`---'\___
	// .' \\\| \|// '.
	// / \\\|\|\| : \|\|\|// \
	// / _\|\|\|\|\| -:- \|\|\|\|\|- \

	ad.flipboard.com
	ads.viksaffiliates.com
	anzeigen-buchen.sueddeutsche.de
	anzeigen.sueddeutsche.de
	app-measurement.com
	blickonl-ssl.wemfbox.ch
	cdn2.teads.tv
	cdn.xplosion.de
	ciqcol01.ciq.labs.att.com
	click2createahero.net

	good, 你已经有了一个自己的shadowsocks代理了，现在想要把这个代理公布出去给所有人分享。
	但是没有两个小时，代理就没法使用了，为什么？因为你需要额外注意以下事项（以下步骤需要比较高的linux技能）
	本文只关注于确保shadowsocks服务还“活着”，如果你希望让其跑得更快，请参考
	https://github.com/clowwindy/shadowsocks/wiki/Optimizing-Shadowsocks

	1、 shadowsocks的timeout设置
	超时时间越长，连接被保持得也就越长，导致并发的tcp的连接数也就越多。对于公共代理，这个值应该调整得小一些。推荐60秒。

	2、检查操作系统的各种限制
	对于openvz的vps，特别需要检查一下

	##################################################################################
	# ELIMINATE SPOTIFY ADS (VERSION 1.2 - 8.5) - UPDATED FREQUENTLY #
	##################################################################################
	#
	# NOTE: SOMETIMES ONLY ANNOUNCEMENT OF AN AD WHILE USING APP VERSION 7.5-7.9?-8.x.
	# USING AN OFFICIAL OLDER VERSION SOLVES THIS. TEST IT (APKMIRROR). THIS WILL NOT
	# OCCUR USING CHROMECAST / GOOGLE HOME.
	#
	# COULD NOT SOLVE THE AUDIO AD INRO/OUTRO IN THE APP.
	# SUGGESTIONS? WRITE A COMMENT BELOW.

Quack~ zoonderkins

Git refusing to merge unrelated histories on rebase

Introduction

新闻w

DNS.md

IPv4